summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ce-gitlab-git-backport' into 'master'Sean McGivern2017-11-063-8/+115
|\
| * Encapsulate git operations for mirroring in Gitlab::GitAlejandro Rodríguez2017-11-033-8/+115
* | Merge branch 'sh-headless-chrome-support' into 'master'Stan Hu2017-11-032-0/+83
|\ \
| * \ Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-032-2/+4
| |\ \
| * \ \ Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-0233-80/+332
| |\ \ \ | | | |/ | | |/|
| * | | fix bracket stylingMike Greiling2017-11-021-5/+5
| * | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-318-22/+140
| |\ \ \
| * | | | allow inspect_request to inject request headers in order to test Sendfile req...Mike Greiling2017-10-301-1/+11
| * | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-2918-43/+130
| |\ \ \ \
| * | | | | slow down requests for dropzone uploads to avoid race conditionsMike Greiling2017-10-241-0/+12
| * | | | | fix rubocop violationsMike Greiling2017-10-241-6/+9
| * | | | | add InspectRequests helperMike Greiling2017-10-231-3/+2
| * | | | | implement basic request inspector for use in Capybara testsMike Greiling2017-10-231-0/+59
* | | | | | Fix Gitlab::Metrics::System#real_time and #monotonic_time docRémy Coutable2017-11-031-2/+2
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'sherlock-ignore-cache' into 'master'Rémy Coutable2017-11-031-1/+3
|\ \ \ \ \
| * | | | | Ignore SQL CACHE hits in Sherlocksherlock-ignore-cacheYorick Peterse2017-11-031-1/+3
* | | | | | Merge branch 'performance-bar-sql-timings' into 'master'Rémy Coutable2017-11-031-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix SQL timings for the performance barYorick Peterse2017-11-031-1/+1
| |/ / / /
* | | | | Merge branch '37631-add-a-merge_request_diff_id-column-to-merge_requests' int...Yorick Peterse2017-11-021-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Set merge_request_diff_id on MR when creatingSean McGivern2017-11-021-1/+1
| * | | | Add a column linking an MR to its diffSean McGivern2017-11-021-0/+1
* | | | | Merge branch 'gitaly-ff-merge' into 'master'Rémy Coutable2017-11-023-9/+42
|\ \ \ \ \
| * | | | | Incorporate Gitaly's OperationService.UserFFBranch RPCgitaly-ff-mergeAlejandro Rodríguez2017-10-313-9/+42
* | | | | | Merge branch 'icons-ci-icons' into 'master'Filipa Lacerda2017-11-0214-14/+14
|\ \ \ \ \ \
| * | | | | | Update Action IconsTim Zallmann2017-10-305-5/+5
| * | | | | | Updated also Badge + Dropdown IconsTim Zallmann2017-10-309-9/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'dm-sidekiq-sigstp' into 'master'Sean McGivern2017-11-021-14/+27
|\ \ \ \ \ \
| * | | | | | Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when t...dm-sidekiq-sigstpDouwe Maan2017-11-021-14/+27
* | | | | | | Merge branch 'dm-remove-private-token' into 'master'Sean McGivern2017-11-021-7/+9
|\ \ \ \ \ \ \
| * | | | | | | Add sudo API scopeDouwe Maan2017-11-021-3/+5
| * | | | | | | Consistently use PersonalAccessToken instead of PersonalTokenDouwe Maan2017-11-021-4/+4
* | | | | | | | Merge branch 'zj-gitaly-migrate-metrics' into 'master'Sean McGivern2017-11-021-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Measure Gitaly migration sites against originalZeger-Jan van de Weg2017-11-011-1/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Geo route whitelisting is too optimisticBrett Walker2017-11-021-2/+3
| |/ / / / / / |/| | | | | |
* | | | | | | Fix encoding issue with Repository.ls_filesKim Carlbäcker2017-11-021-1/+1
* | | | | | | Merge branch 'jej/lfs-change-detection' into 'master'Douwe Maan2017-11-014-12/+134
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Detect changes to LFS pointers for pruning and integrity checkJames Edwards-Jones2017-11-014-12/+134
* | | | | | | Merge branch '35914-merge-request-update-worker-is-slow' into 'master'Sean McGivern2017-11-011-0/+2
|\ \ \ \ \ \ \
| * | | | | | | reword `targets` to `metric tags`micael.bergeron2017-10-311-1/+1
| * | | | | | | add metrics tagging to the sidekiq middlewaremicael.bergeron2017-10-311-0/+2
* | | | | | | | Merge branch 'backport-workhorse-show-all-refs' into 'master'Douwe Maan2017-11-011-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Support show-all-refs for git over HTTPNick Thomas2017-10-301-2/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '39628-bug-in-the-procedure-advised-from-ee_compat_check' into '...Sean McGivern2017-11-011-11/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure the ee-compat-check uses the correct patch URL for forks39628-bug-in-the-procedure-advised-from-ee_compat_checkRémy Coutable2017-10-311-11/+13
| |/ / / / / / /
* | | | | | | | Merge branch 'feature/migrate-find-wiki-file-to-gitaly' into 'master'Sean McGivern2017-11-013-5/+65
|\ \ \ \ \ \ \ \
| * | | | | | | | Migrate Gitlab::Git::Wiki#file to Gitalyfeature/migrate-find-wiki-file-to-gitalyAhmad Sherif2017-10-313-5/+65
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'go-get-ssh' into 'master'Douwe Maan2017-11-011-2/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Returns a ssh url for go-get=1Guilherme Vieira2017-10-311-2/+13
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'feature/migrate-find-wiki-page-to-gitaly' into 'master'Sean McGivern2017-10-313-7/+82
|\ \ \ \ \ \ \
| * | | | | | | Migrate Gitlab::Git::Wiki#page to Gitalyfeature/migrate-find-wiki-page-to-gitalyAhmad Sherif2017-10-313-7/+82