- 19 Dec, 2017 6 commits
-
-
Sean McGivern authored
Include project in BatchLoader key to prevent returning blobs for the wrong project Closes gitlab-ee#4325 See merge request gitlab-org/gitlab-ce!15936 (cherry picked from commit f5114187) 6c4f6d37 Include project in BatchLoader key to prevent returning blobs for the wrong project f871027e Clear BatchLoader after each spec to prevent holding onto records longer than necessary
-
Douwe Maan authored
Clarifies documentation for user, group & project transfers See merge request gitlab-org/gitlab-ce!15896 (cherry picked from commit af110b89) 1bdbff2d Updates doc for user, group & project transfers
-
Robert Speicher authored
Cache feature check for 1 minute for MethodCall instrumentation toggle See merge request gitlab-org/gitlab-ce!15800 (cherry picked from commit 83998c0a) 53dc9e83 Cache feature check for 5 minutes for MethodCall instrumentation toggle b503e6ff Implement simple in memory cache that expires after 5 minutes 6af84964 Set cache expire only once the cache is filled, 5904b033 Implemente measurement enabled cache using AtomicReference 408208bc Use AtomicFixNum to implement CAS isolated cache update. ca176a9b move call_measurement_enabled? method to the bottom of the file fd0a5168 use class variables instead of CONSTANTs da19ce62 Expire feature flag cache after 1minute 51668d3e Use class variable and add rubocop exception db9e5bf7 fix test case description
-
Oswaldo Ferreira authored
Restore throttling of touch for 10.3 stable See merge request gitlab-org/gitlab-ce!15890
-
James Lopez authored
-
Oswaldo Ferreira authored
Fix missing WHERE clause in 20171106135924_issues_milestone_id_foreign_key migration Closes gitlab-com/infrastructure#3416 See merge request gitlab-org/gitlab-ce!15997
-
- 14 Dec, 2017 5 commits
-
-
Tiago Botelho authored
-
Yorick Peterse authored
This allows EE to re-use the object, making it easier to trigger indexing of the noteable.
-
Yorick Peterse authored
-
Kamil Trzciński authored
Dependencies Validator fails when depended job is `manual` Closes #41110 See merge request gitlab-org/gitlab-ce!15924 (cherry picked from commit 57175ecb) 1def948b Dependencies Validator fails when depended job is `manual`
-
James Lopez authored
Prepare 10.3 RC1 release See merge request gitlab-org/gitlab-ce!15907
-
- 13 Dec, 2017 29 commits
-
-
Sean McGivern authored
Prevent worker that updates merge requests head pipeline from failing jobs Closes #41021 See merge request gitlab-org/gitlab-ce!15870
-
Oswaldo Ferreira authored
This reverts commit 54f00812.
-
LUKE BENNETT authored
-
Oswaldo Ferreira authored
-
Luke Bennett authored
Merge branch '10-3-stable-prepare-rc1' of https://gitlab.com/gitlab-org/gitlab-ce into 10-3-stable-prepare-rc1
-
Sean McGivern authored
Use memoization for commits on diffs See merge request gitlab-org/gitlab-ce!15857
-
Achilleas Pipinellis authored
Fix entrypoint overriding documentation See merge request gitlab-org/gitlab-ce!15884 (cherry picked from commit a2c615d1) b17c3ab6 Fix entrypoint overriding documentation 9f3df649 Refactor entrypoint override docs
-
Winnie Hellmann authored
Resolve merge conflicts with dev.gitlab.org/master after security release See merge request gitlab-org/gitlab-ce!15851 (cherry picked from commit d9f40fdd) 4f992572 Update CHANGELOG.md for 10.2.4 84b3c215 Update CHANGELOG.md for 10.1.5 fad2a07c Update CHANGELOG.md for 10.0.7 10131bf2 Merge remote-tracking branch 'gitlab-ce/master' d9453a24 Merge dev.gitlab.org/master into winh-merge-dev be586388 Make CHANGELOG.md consistent for 10.2.4, 10.1.5, and 10.0.7
-
LUKE BENNETT authored
Updates dependencies license list See merge request gitlab-org/gitlab-ce!15905 (cherry picked from commit 097b0678) f7e084c0 Updates dependencies license list
-
Tim Zallmann authored
Resolve "Prometheus loading screen no longer seems to appear" Closes #40285 See merge request gitlab-org/gitlab-ce!15889 (cherry picked from commit a8b98528) d072c0cd fix broken empty state assets for environment monitoring page 9864720a add CHANGELOG.md entry for !15889
-
Sean McGivern authored
Fix migration that removes issues.branch_name See merge request gitlab-org/gitlab-ce!15858
-
Robert Speicher authored
Gitaly mirroring migration prep Closes gitaly#816 See merge request gitlab-org/gitlab-ce!15775 (cherry picked from commit 6930fa31) 885a4da2 Add feature flag to use gitaly-ssh mirroring when cloning internal repos 95009cef Unify mirror addition operations to prepare for Gitaly migration
-
Yorick Peterse authored
check the import_status field before doing SQL operations to check the import url See merge request gitlab-org/gitlab-ce!15752 (cherry picked from commit 49a9de11) 946d87d3 check the import_status field before doing SQL operations to check the import url
-
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
-
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
-
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
-
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…
-
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
-
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
-
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
-
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
-
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
-
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
-
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
-