summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / /
* | | | Repair Regression caused by - !11573Paul Charlton2017-07-111-1/+1
* | | | Support multiple Redis instances based on queue typePaul Charlton2017-07-1122-174/+393
* | | | Merge branch 'master' into 'catch-redis-address-error'DJ Mountney2017-07-10109-476/+2521
|\ \ \ \ | |/ / /
| * | | Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'Sean McGivern2017-07-103-5/+59
| |\ \ \
| | * | | Remove remaining N+1 queries in merge requests API with emojis and labelsStan Hu2017-07-083-5/+59
| * | | | Merge branch '34728-fix-application-setting-created-when-redis-down' into 'ma...Stan Hu2017-07-101-6/+1
| |\ \ \ \
| | * | | | Prevent bad data being added to application settings when Redis is unavailableNick Thomas2017-07-101-6/+1
| * | | | | Re-add Feature.register_feature_groups which is already documentedRémy Coutable2017-07-101-0/+6
| |/ / / /
| * | | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-07-101-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix gitlab-ee reference in ee_compat_checkPedro Moreira da Silva2017-07-071-1/+1
| * | | | Merge branch 'dm-routing-helpers-fix' into 'master'31331-view-time-tracking-info-in-issue-board-contextual-sidebar29974-real-time-emoji-award-updatesMarin Jankovski2017-07-091-4/+9
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Also inject new route helpers into includers of GitlabRoutingHelperdm-routing-helpers-fixDouwe Maan2017-07-081-4/+9
| * | | | Merge branch 'fix/gb/stage-id-reference-background-migration' into 'master'Grzegorz Bizon2017-07-081-0/+19
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into 'fix/gb/stage-id-reference-background-migration'Grzegorz Bizon2017-07-0710-36/+108
| | |\ \ \ \
| | * | | | | Simplify stage_id migration as we now use relationsGrzegorz Bizon2017-07-071-9/+4
| | * | | | | Schedule stage_id bg migrations in batches of 10Grzegorz Bizon2017-07-071-1/+1
| | * | | | | Merge remote-tracking branch 'origin/active-record-each-batch' into fix/gb/st...Grzegorz Bizon2017-07-0716-105/+223
| | |\ \ \ \ \
| | | * | | | | Added EachBatch for iterating tables in batchesYorick Peterse2017-07-071-1/+1
View Lorry Controller Status