summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/gb/process-scheduled-background-migrations' into 'master'Yorick Peterse2017-07-171-7/+28
|\
| * Simplify background migrations stealing codeGrzegorz Bizon2017-07-171-15/+3
| * Fix off-by-one error in background migration retriesfix/gb/process-scheduled-background-migrationsGrzegorz Bizon2017-07-171-5/+10
| * Recover from all exceptions when stealing bg migrationGrzegorz Bizon2017-07-171-4/+22
| * Catch exceptions when stealing background migrationsGrzegorz Bizon2017-07-141-1/+6
| * Avoid race condition when stealing a background migrationGrzegorz Bizon2017-07-141-3/+1
| * Fix mocks in background migrations specsGrzegorz Bizon2017-07-131-1/+0
| * Implement draining scheduled sets of background migrationsGrzegorz Bizon2017-07-131-7/+12
| * Extract background migratons queue class methodGrzegorz Bizon2017-07-111-2/+5
* | Expire cached user IDs that can see the performance after 5 minutesRémy Coutable2017-07-171-2/+3
* | Merge branch 'remove-git-search-files' into 'master'Sean McGivern2017-07-171-89/+0
|\ \
| * | Remove Repository#search_filesremove-git-search-filesJacob Vosmaer2017-07-141-89/+0
* | | Merge branch 'gitaly-more-annotations' into 'master'Sean McGivern2017-07-175-61/+65
|\ \ \
| * | | Gitaly migration annotationsJacob Vosmaer2017-07-141-0/+4
| * | | Use helper instead of ad-hoc regexJacob Vosmaer2017-07-141-2/+1
| * | | Make commit lookups explicitJacob Vosmaer2017-07-145-42/+45
| * | | Remove deprecated #heads methodJacob Vosmaer2017-07-141-7/+0
| * | | Make branch filter support privateJacob Vosmaer2017-07-141-11/+16
| |/ /
* | | Merge branch 'bjk/metric_names' into 'master'Douwe Maan2017-07-144-49/+44
|\ \ \
| * | | Rename ConnectionRackMiddleware to RequestsRackMiddleware.bjk/metric_namesPawel Chojnacki2017-07-132-40/+40
| * | | Add unit to latency metrics.Ben Kochie2017-07-122-4/+4
| * | | Update rack metric namesBen Kochie2017-07-121-9/+4
* | | | Merge branch 'pass-before-script-as-is' into 'master'Grzegorz Bizon2017-07-142-1/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Pass before_script and script as-is preserving arrayspass-before-script-as-isKamil Trzcinski2017-07-072-1/+4
* | | | Merge branch 'gitlab-git-repository-log' into 'master'Sean McGivern2017-07-144-79/+102
|\ \ \ \
| * | | | Indirectly migrate count_commits_between to GitalyJacob Vosmaer2017-07-131-1/+1
| * | | | More Gitaly annotationsJacob Vosmaer2017-07-133-0/+19
| * | | | Change Git::Repository#log to return CommitsJacob Vosmaer2017-07-132-78/+82
* | | | | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-145-7/+28
|\ \ \ \ \
| * | | | | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-135-7/+28
* | | | | | Handle case when BroadcastMessage.current is nilStan Hu2017-07-131-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'lib-git-gitaly' into 'master'Sean McGivern2017-07-1322-96/+70
|\ \ \ \ \
| * | | | | Try to eliminate unused diff optionsJacob Vosmaer2017-07-121-96/+4
| * | | | | Add Gitaly notes and annotations to Gitlab::GitJacob Vosmaer2017-07-1221-0/+66
| | |_|/ / | |/| | |
* | | | | Merge branch 'migrate-workhorse-send-blob-to-gitaly' into 'master'Robert Speicher2017-07-121-4/+22
|\ \ \ \ \
| * | | | | Migrate Workhorse SendBlob to GitalyAhmad Sherif2017-07-111-4/+22
* | | | | | Merge branch 'mr-branch-link-use-tree' into 'master'Robert Speicher2017-07-121-1/+1
|\ \ \ \ \ \
| * | | | | | Add namespace for BlobClement Ho2017-07-111-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'backport-ee-2405' into 'master'Douwe Maan2017-07-121-3/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Extract the finder portion of ldap_person so it can be overridden in EENick Thomas2017-07-121-3/+7
* | | | | | Return `is_admin` attribute in the GET /user endpoint for adminsRémy Coutable2017-07-121-1/+10
|/ / / / /
* | | | | Merge branch 'rs-issue-34941' into 'master'Stan Hu2017-07-111-8/+20
|\ \ \ \ \
| * | | | | Make `Redis::Wrapper#_raw_config` and `#fetch_config` more resilientRobert Speicher2017-07-111-8/+20
* | | | | | Merge branch 'sh-add-mr-simple-mode' into 'master'Sean McGivern2017-07-112-5/+27
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use view=simple for simplifying merge requests APIStan Hu2017-07-111-3/+3
| * | | | | Add a simple mode to merge request APIsh-add-mr-simple-modeStan Hu2017-07-112-5/+27
| | |_|_|/ | |/| | |
* | | | | Don't reload ActiveRecord objects when building note URLsSean McGivern2017-07-111-5/+3
|/ / / /
* | | | Merge branch 'sh-improve-mr-api' into 'master'Sean McGivern2017-07-111-4/+4
|\ \ \ \
| * | | | Fix sort ordering with merge request APIsh-improve-mr-apiStan Hu2017-07-101-4/+3
| * | | | Paginate the merge requests API earlier to avoid eager loading every merge re...Stan Hu2017-07-101-1/+2
| |/ / /
View Lorry Controller Status