summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-add-simple-mode-mr-api-9-4-stable' into '9-4-stable-preparin...James Edwards-Jones2017-07-141-0/+36
|\
| * Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'Sean McGivern2017-07-111-0/+36
* | Merge branch 'catch-redis-address-error' into 'master'Stan Hu2017-07-111-1/+1
* | Merge branch 'fix-n-plus-one-in-url-builder' into 'master'Rémy Coutable2017-07-111-5/+3
* | Merge branch '34728-fix-application-setting-created-when-redis-down' into 'ma...Stan Hu2017-07-111-6/+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-075-31/+41
| |\
| * | 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-079-48/+101
| |\ \
| | * | 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 '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
| * | | | | Add gitaly_git_blob_raw featureJacob Vosmaer2017-07-072-12/+52
| |/ / / /
* | | | | Merge branch '33929-allow-to-enable-perf-bar-for-a-group' into 'master'Sean McGivern2017-07-071-2/+28
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group'Sean McGivern2017-07-072-5/+20
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-groupSean McGivern2017-07-0710-72/+120
| |\ \ \ \
| * | | | | Don't use Flipper for the Performance BarRémy Coutable2017-07-071-10/+3
| * | | | | Allow to enable the Performance Bar for a group from the admin areaRémy Coutable2017-07-061-8/+10
| * | | | | Use Rails.cache instead of Redis directlyRémy Coutable2017-07-061-22/+7
| * | | | | Cache the allowed user IDs for the performance bar, in Redis for 10 minutesRémy Coutable2017-07-061-17/+35
| * | | | | Improve feature flag check for the performance barRémy Coutable2017-07-061-2/+2
| * | | | | Hide 'peek' by using 'performance bar' insteadRémy Coutable2017-07-061-8/+5
| * | | | | Cache PerformanceBar data using RequestStoreRémy Coutable2017-07-061-7/+22
| * | | | | Allow to enable the performance bar per user or Flipper groupRémy Coutable2017-07-061-2/+18
| | |_|/ / | |/| | |
* | | | | Merge branch 'active-record-each-batch' into 'master'Sean McGivern2017-07-071-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Added EachBatch for iterating tables in batchesactive-record-each-batchYorick Peterse2017-07-071-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'feature/migrate-commit-count-to-gitaly' into 'master'Robert Speicher2017-07-072-5/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | Migrate Gitlab::Git::Repository#commit_count to Gitalyfeature/migrate-commit-count-to-gitalyAhmad Sherif2017-07-072-5/+20
* | | | Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'Kamil Trzciński2017-07-071-0/+1
|\ \ \ \
| * | | | Add dash for GROUP_ROUTESShinya Maeda2017-07-071-0/+1
| * | | | Wrap additional routes by dash(-). And remove those routes from path_regex.rb.Shinya Maeda2017-07-071-2/+0
| * | | | Basic BE changeShinya Maeda2017-07-071-0/+2
| | |/ / | |/| |
* | | | Merge branch 'gitaly-mandatory' into 'master'Sean McGivern2017-07-072-26/+20
|\ \ \ \ | |/ / / |/| | |
| * | | Remove option to disable Gitaly completelyJacob Vosmaer2017-07-072-26/+20
| | |/ | |/|
* | | Improve & fix the performance bar UI and behaviorRémy Coutable2017-07-061-1/+1
View Lorry Controller Status