summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-add-mr-simple-mode' into 'master'sh-add-simple-mode-mr-api-9-4-stableSean McGivern2017-07-115-5/+48
* Merge branch 'sh-improve-mr-api' into 'master'Sean McGivern2017-07-111-4/+4
* Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'Sean McGivern2017-07-117-41/+145
* Merge branch 'rs-sign_in' into 'master'Douwe Maan2017-07-09280-413/+398
|\
| * Change `sign_out` usage to `gitlab_sign_out` in one specRobert Speicher2017-07-071-2/+2
| * Merge branch 'master' into rs-sign_inRobert Speicher2017-07-07111-294/+2132
| |\
| * \ Merge branch 'master' into rs-sign_inRobert Speicher2017-07-07266-1119/+3642
| |\ \
| * \ \ Merge branch 'master' into rs-sign_inRobert Speicher2017-07-06906-5137/+11025
| |\ \ \
| * | | | Auto-correct ProjectPathHelper violationsRobert Speicher2017-07-06224-893/+810
| * | | | Add ProjectPathHelper copDouwe Maan2017-07-063-0/+93
| * | | | Remove instance variable assignment from `gitlab_sign_in` helperrs-sign_inRobert Speicher2017-06-291-4/+4
| * | | | Change gitlab_sign_out to sign_out where possibleRobert Speicher2017-06-291-3/+3
| * | | | Remove gitlab_sign_out_direct helperRobert Speicher2017-06-292-7/+2
| * | | | Remove a duplicated test block from the result of a conflict resolutionRobert Speicher2017-06-291-26/+0
| * | | | Change gitlab_sign_in to sign_in where possibleRobert Speicher2017-06-29284-371/+392
* | | | | 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-092-4/+13
|\ \ \ \ \
| * | | | | Also inject new route helpers into includers of GitlabRoutingHelperdm-routing-helpers-fixDouwe Maan2017-07-082-4/+13
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix/gb/stage-id-reference-background-migration' into 'master'Grzegorz Bizon2017-07-087-7/+189
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'fix/gb/stage-id-reference-background-migration'Grzegorz Bizon2017-07-07235-873/+3376
| |\ \ \ \ \
| * | | | | | Simplify stage_id migration as we now use relationsGrzegorz Bizon2017-07-071-9/+4
| * | | | | | Do not schedule bg migration when it is not neededGrzegorz Bizon2017-07-072-3/+2
| * | | | | | Schedule stage_id bg migrations in batches of 10Grzegorz Bizon2017-07-073-8/+13
| * | | | | | Use new `each_batch` helper instead of custom oneGrzegorz Bizon2017-07-073-11/+13
| * | | | | | Merge remote-tracking branch 'origin/active-record-each-batch' into fix/gb/st...Grzegorz Bizon2017-07-07172-753/+2454
| |\ \ \ \ \ \
| | * | | | | | Added EachBatch for iterating tables in batchesYorick Peterse2017-07-078-1/+185
| * | | | | | | Revert recent changes in migration helpersGrzegorz Bizon2017-07-072-172/+30
| * | | | | | | Add some comments on new migrations helpersGrzegorz Bizon2017-07-071-0/+38
| * | | | | | | Schedule stage_id background migration in rangesGrzegorz Bizon2017-07-074-19/+22
| * | | | | | | Extract `execute_in_batches` migrations helperGrzegorz Bizon2017-07-072-22/+60
| * | | | | | | Add walk_table_in_batches and refactor migration helpersGrzegorz Bizon2017-07-072-31/+97
| * | | | | | | Reduce a delay between stage_id scheduled migrationsGrzegorz Bizon2017-07-072-5/+5
| * | | | | | | Improve exception description in bg migrationsGrzegorz Bizon2017-07-071-1/+3
| * | | | | | | Do not override original AR5 batching interfaceGrzegorz Bizon2017-07-072-4/+7
| * | | | | | | Sanitize id value passed to async background migrationGrzegorz Bizon2017-07-071-3/+1
| * | | | | | | Improve code examples in background migrations docsGrzegorz Bizon2017-07-071-4/+2
| * | | | | | | Add description to exception in bg migrations workerGrzegorz Bizon2017-07-071-1/+1
| * | | | | | | Do not compare float with integer in migrations specsGrzegorz Bizon2017-07-071-1/+1
| * | | | | | | Improve readability of build stage id migration queryGrzegorz Bizon2017-07-072-8/+9
| * | | | | | | Use integers to schedule delayed background migrationsGrzegorz Bizon2017-07-072-3/+3
| * | | | | | | Test if argument passed to a migration is presentGrzegorz Bizon2017-07-071-1/+1
| * | | | | | | Make `inline` a default sidekiq testing processing againGrzegorz Bizon2017-07-071-1/+1
| * | | | | | | Improve specs for background stage_id ref migrationGrzegorz Bizon2017-07-072-12/+18
| * | | | | | | Perform stage_id ref backgound migration in bulksGrzegorz Bizon2017-07-071-3/+3
| * | | | | | | Remove unused background migrations matcherGrzegorz Bizon2017-07-071-12/+0
| * | | | | | | Use ActiveRecord 5 batching to schedule bg migrationGrzegorz Bizon2017-07-074-36/+32
| * | | | | | | Make it possible to schedule bg migrations in bulkGrzegorz Bizon2017-07-074-8/+70
| * | | | | | | Add specs for delayed stage_id background migrationsGrzegorz Bizon2017-07-072-7/+51
| * | | | | | | Schedule background migration only when it is neededGrzegorz Bizon2017-07-071-4/+6
| * | | | | | | Find builds that require a migration in batchesGrzegorz Bizon2017-07-072-3/+8
| * | | | | | | Add initial build stage_id ref background migrationGrzegorz Bizon2017-07-073-7/+26
View Lorry Controller Status