BigW Consortium Gitlab

  1. 13 Dec, 2017 21 commits
    • Merge branch 'jprovazn-description' into 'master' · b93a76b0
      Sean McGivern authored
      Use message body for merge request description
      
      Closes #40968
      
      See merge request gitlab-org/gitlab-ce!15839
      
      (cherry picked from commit 52d9ee62)
      
      b39b5524 Use message body for merge request description
    • Merge branch 'dm-image-blob-diff-full-url' into 'master' · 32035070
      Sean McGivern authored
      Use app host instead of asset host when rendering image blob or diff
      
      Closes #41002
      
      See merge request gitlab-org/gitlab-ce!15854
      
      (cherry picked from commit 6b83f0d0)
      
      e8d0d6ba Use app host instead of asset host when rendering image blob or diff
    • Merge branch 'diff-file-navigation-doc-screenshot-docs' into 'master' · d873fdb1
      Filipa Lacerda authored
      Updated image for diff navigation docs
      
      See merge request gitlab-org/gitlab-ce!15875
      
      (cherry picked from commit d8722e80)
      
      d66e9370 Updated image for diff navigation docs
    • Merge branch… · 2886bdce
      Douwe Maan authored
      Merge branch '41041-undefined-method-new_project_guidelines_html-unable-to-load-from-cache' into 'master'
      
      Resolve "undefined method `new_project_guidelines_html', unable to load from cache"
      
      Closes #41041
      
      See merge request gitlab-org/gitlab-ce!15878
      
      (cherry picked from commit 2750d7e6)
      
      3b860069 Clears the current Appearance cache otherwise it breaks since…
    • Merge branch… · 2a6a3737
      Kamil Trzciński authored
      Merge branch '41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-build' into 'master'
      
      Job dropping by MissingDependenciesError should consider StaleObjectError
      
      Closes #41023
      
      See merge request gitlab-org/gitlab-ce!15873
      
      (cherry picked from commit 6fff0473)
      
      3494cdfe ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build
    • Merge branch 'fix-image-view-mode' into 'master' · 90324cf7
      Filipa Lacerda authored
      Fix image view mode
      
      Closes #40945
      
      See merge request gitlab-org/gitlab-ce!15803
      
      (cherry picked from commit fb47f2a7)
      
      e815e8eb Fix image view mode
      aa2031b6 Add spec
    • Merge branch 'mk-fix-schema-dump-of-untracked-files-for-uploads' into 'master' · 7f88b092
      Stan Hu authored
      Ignore temporary table in schema
      
      Closes #40976
      
      See merge request gitlab-org/gitlab-ce!15866
      
      (cherry picked from commit 9e9d3313)
      
      61267ca9 Ignore temporary table in schema
    • Merge branch 'backport-epic-in-issue' into 'master' · 75f28ea4
      Jacob Schatz authored
      Backport epic in issue
      
      See merge request gitlab-org/gitlab-ce!15799
      
      (cherry picked from commit 9c6ce2e8)
      
      bd7218f2 Backport epic in issue
    • Merge branch '35724-animate-sidebar' into 'master' · 47f916f9
      Filipa Lacerda authored
      Animate contextual sidebar; change class names for easier readability
      
      Closes #35724
      
      See merge request gitlab-org/gitlab-ce!15797
      
      (cherry picked from commit 2d00ad48)
      
      37f0ee04 Animate contextual sidebar; change class names for easier readability
      a1d5d49a Add changelog
      ee85ca73 Fix mobile styles
      e0172564 Fix transitions
    • Merge branch 'sh-bump-prometheus-gem-properly' into 'master' · 1096319e
      Robert Speicher authored
      Properly bump prometheus-client-mmap gem versions
      
      See merge request gitlab-org/gitlab-ce!15825
      
      (cherry picked from commit a2d16480)
      
      938cc162 Properly bump prometheus-client-mmap gem versions
    • Merge branch 'sh-remove-allocation-tracking-influxdb' into 'master' · ced708d3
      Yorick Peterse authored
      Remove allocation tracking code from InfluxDB sampler for performance
      
      Closes gitlab-com/infrastructure#3250
      
      See merge request gitlab-org/gitlab-ce!15834
      
      (cherry picked from commit 3daa7331)
      
      e1a8e5a5 Remove allocation tracking code from InfluxDB sampler for performance
      10f5446c Remove RubySampler#sample_objects for performance as well
    • Merge branch 'mk-pick-10-2-4-security-fixes' into 'master' · 5d076319
      Winnie Hellmann authored
      Pick 10.2.4 security fixes into master
      
      See merge request gitlab-org/gitlab-ce!15821
      
      (cherry picked from commit 1eff1bd3)
      
      d332c8c7 Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into 'security-10-2'
      8c0aa7d4 Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'
      8f29d264 Merge branch 'rs-security-group-api' into 'security-10-2'
      c59ae547 Merge branch 'issue_30663' into 'security-10-2'
      f4fbe61a Merge branch 'note-preview' into 'security-10-2'
      0f811675 Manually add 10.2.4 changelog entries
      f71e48a0 Resolve conflicts in app/models/user.rb
    • Merge branch 'bvl-circuitbreaker-metrics' into 'master' · 0f68a466
      Douwe Maan authored
      Keep track of the circuit breaker access check timings
      
      Closes #39698
      
      See merge request gitlab-org/gitlab-ce!15612
      
      (cherry picked from commit 13ac8e57)
      
      d4d06bde Keep track of storage check timings
    • Merge branch 'qa/gb/improve-multi-project-pipeline-omnibus-script' into 'master' · d3a882b4
      Grzegorz Bizon authored
      Do not raise when downstream pipeline is created
      
      Closes #40987
      
      See merge request gitlab-org/gitlab-ce!15837
      
      (cherry picked from commit 95daf62b)
      
      90569a17 Do not raise when downstream pipeline is created
    • Merge branch 'recaptcha_check_if_spammable_ce_backport' into 'master' · 402e4c9b
      Sean McGivern authored
      Add recaptcha_check_if_spammable for issualbes than arent spammables
      
      See merge request gitlab-org/gitlab-ce!15817
      
      (cherry picked from commit 689bc9ea)
      
      0e935c76 Add recaptcha_check_if_spammable for issualbes than arent spammables
    • Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master' · 8599126a
      Douwe Maan authored
      Fix invalid pipeline build chain tag evaluation
      
      Closes #40944
      
      See merge request gitlab-org/gitlab-ce!15805
      
      (cherry picked from commit 103269b9)
      
      b30e0e06 Fix invalid pipeline build chain tag evaluation
      ad3be46b Implement and use Gitlab::Ci::Pipeline::Chain::Command
      865341ac Fix a bug of before_sha being inproperly evaluated to `checkout_sha`
      b5f6a5f9 Add Chain::Command specs
      99101f94 Fix Rubocop
    • Merge branch 'sh-fix-import-rake-task' into 'master' · 0f04fa28
      James Lopez authored
      Fix gitlab:import:repos Rake task moving repositories into the wrong location
      
      Closes #40765
      
      See merge request gitlab-org/gitlab-ce!15823
      
      (cherry picked from commit 7694ae88)
      
      78f7c3c8 Fix gitlab:import:repos Rake task moving repositories into the wrong location
      e8cced80 Fix failing importer test case on MySQL due to missing trailing slash in root path
      917a112e Simplify normalizing of paths
      86661a3a Use build instead of create in importer spec
      f1eaab7b Remove the need for destroy and add a comment in the spec
    • Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master' · 0d09108a
      Mike Greiling authored
      Resolve "Deploy markers should be more verbose"
      
      Closes #38032
      
      See merge request gitlab-org/gitlab-ce!15641
      
      (cherry picked from commit 87300546)
      
      d377aa54 Changed the deploy markers on the prometheus dashboard to be more verbose
      3642f6f0 Reduce the size of the deploy flag when there's no tag available
    • Merge branch '35385-allow-git-pull-push-on-project-redirects' into 'master' · adc7178e
      Douwe Maan authored
      Allow git pull/push on project redirects
      
      Closes #35385
      
      See merge request gitlab-org/gitlab-ce!15670
      
      (cherry picked from commit 2a181d68)
      
      37c99562 Allow git pull/push on project redirects
      64811239 Allow group/username transfers:
      4344bba4 Fixes wrong condition on git access
      b6bac528 Wrap ProjectMoved behavior into a class
      70676e3b Fixes permanent migration
      3328950e Moves allowed_path_validation up to Namespace
      54900c4a Addreses ME review comments
      740ed1e0 Add several improvements
      6a0d9261 Add fixes based on MR suggestions
      8a1a257b Ensures validations are only executed if RedirectRoute#permanent column exists
      448f1c54 Fixes broken specs and suggestions on MR
      da789af6 Add fixes based on MR comments
      2bd96f5f Bump GITLAB_SHELL_VERSION to 5.10.2
      75981dc4 Ensure RedirectRoute column information is flushed
    • Merge branch 'fix-event-target-author-preloading' into 'master' · 4ddf0c69
      Douwe Maan authored
      Fix N+1 query when displaying events
      
      See merge request gitlab-org/gitlab-ce!15788
      
      (cherry picked from commit 53026c42)
      
      c52a36e8 Fix N+1 query when displaying events
    • Merge branch… · ea63ce0d
      Sean McGivern authored
      Merge branch '29483-no-feedback-when-checking-on-checklist-if-potential-spam-was-detected' into 'master'
      
      Resolve "No feedback when checking on checklist if potential spam was detected"
      
      Closes #29483
      
      See merge request gitlab-org/gitlab-ce!15408
      
      (cherry picked from commit d32032de)
      
      efc86c26 Mock spam?
      8e9a9030 Merge remote-tracking branch 'origin/master' into…
      019db0fd TEMP mock askismet spam check
      11e51be6 respond_to json with json version of verify view in recaptcha_check_with_fallback
      18955cdc Differentiate between spam related error and other update errors
      9dcf093c Start recaptcha modal and render partial instead
      64b13133 Append and remove api script when reCAPTCHA is needed
      c9a67fab put-over-post the recaptcha form
      cb22ae66 remove comments
      20517d64 remove comments
      e174d02e Review changes
      7a7d4a2a Add spec
      8f617b45 Added changelog
      db3f1a47 Review changes
      4d0c78de Add to tasklist
      36ea921b Remove duplicate TaskList
      6bffe620 Add app_spec for spam
      d95350bc Finished specs
      cf951cba FOR REVIEWERS
      6c50e850 FOR MERGE
      25931f73 Allow script src to be mockable
      c3463e00 Merge remote-tracking branch 'origin/master' into…
      2c170b8d fix eslint
      a318c757 Fix redirect
      8a02fbd0 BE review changes
      dda03f4d Fix spec
      910c7205 Fix spec
      fafbd7e5 remove duplicate destroy
  2. 12 Dec, 2017 1 commit
  3. 08 Dec, 2017 6 commits
  4. 07 Dec, 2017 12 commits