summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | | | Revert recent changes in migration helpersGrzegorz Bizon2017-07-071-94/+26
| | * | | | | Add some comments on new migrations helpersGrzegorz Bizon2017-07-071-0/+38
| | * | | | | Schedule stage_id background migration in rangesGrzegorz Bizon2017-07-072-4/+9
| | * | | | | Extract `execute_in_batches` migrations helperGrzegorz Bizon2017-07-071-15/+24
| | * | | | | Add walk_table_in_batches and refactor migration helpersGrzegorz Bizon2017-07-071-27/+48
| | * | | | | Sanitize id value passed to async background migrationGrzegorz Bizon2017-07-071-3/+1
| | * | | | | Improve readability of build stage id migration queryGrzegorz Bizon2017-07-071-6/+7
| | * | | | | Test if argument passed to a migration is presentGrzegorz Bizon2017-07-071-1/+1
| | * | | | | Add initial build stage_id ref background migrationGrzegorz Bizon2017-07-071-7/+11
| | * | | | | Add initial stage_id background migration filesGrzegorz Bizon2017-07-071-0/+16
| * | | | | | Merge branch 'sh-optimize-mr-api' into 'master'Stan Hu2017-07-081-1/+3
| |\ \ \ \ \ \
| | * | | | | | Remove many N+1 queries with merge requests APIsh-optimize-mr-apiStan Hu2017-07-071-1/+3
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'gitaly-internal-allowed-send-repo' into 'master'Robert Speicher2017-07-082-7/+31
| |\ \ \ \ \ \
| | * | | | | | Send Gitaly Repository with /api/internal/allowedgitaly-internal-allowed-send-repoKim "BKC" Carlbäcker2017-07-072-7/+31
| * | | | | | | Merge branch 'feature/user-datetime-search-api-mysql' into 'master'Douwe Maan2017-07-071-0/+6
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | refactor created at filter to use model scopesJames Lopez2017-07-071-17/+0
| | * | | | | | fix specsJames Lopez2017-07-071-1/+1
| | * | | | | | refactor filtersJames Lopez2017-07-071-0/+17
| | * | | | | | add created at filter logic to users finder and APIJames Lopez2017-07-071-0/+6
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'dm-fix-project-path-helpers-production' into 'master'Douwe Maan2017-07-076-5/+25
| |\ \ \ \ \ \
| | * | | | | | Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-productionDouwe Maan2017-07-076-5/+25
| * | | | | | | Merge branch 'gitaly-get-blob' into 'master'Sean McGivern2017-07-072-13/+62
| |\ \ \ \ \ \ \
| | * | | | | | | Add git_blob_load_all_data feature flagJacob Vosmaer2017-07-071-1/+10