summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '33949-remove-healthcheck-access-token' into 'master'9-4-stable-prepare-RC1Sean McGivern2017-07-1113-90/+228
* Merge branch '34907-dont-show-pipeline-schedule-button-for-non-member' into '...Kamil Trzciński2017-07-113-130/+169
* Merge branch 'jej/9-4-update-license-list' into 'master'Rémy Coutable2017-07-111-260/+300
* Merge branch 'fix/gb/qa/configure-headless-chrome-screenshots' into 'master'Rémy Coutable2017-07-111-0/+4
* Merge branch 'fix_milestone_destroy_service' into 'master'Mike Greiling2017-07-112-2/+55
* Merge branch 'revert_bootsnap' into 'master'Robert Speicher2017-07-114-15/+0
* Merge branch 'catch-redis-address-error' into 'master'Stan Hu2017-07-112-2/+2
* Merge branch 'sidebar-badge-fix-firefox' into 'master'Filipa Lacerda2017-07-111-2/+2
* Merge branch 'document-gitlab-shell-disable-gems' into 'master'Stan Hu2017-07-111-0/+6
* Merge branch 'sh-fix-award-emoji-spec' into 'master'Rémy Coutable2017-07-111-2/+2
* Merge branch 'sh-disabled-prepared-statements-in-test' into 'master'Yorick Peterse2017-07-112-0/+2
* Merge branch '34933-fix-welcome-page-actions-alignment' into 'master'Phil Hughes2017-07-115-92/+40
* Merge branch 'fix-n-plus-one-in-url-builder' into 'master'Rémy Coutable2017-07-112-5/+7
* Merge branch 'fix/gb/qa/fix-test-scenario-for-adding-a-project' into 'master'Rémy Coutable2017-07-114-19/+8
* Merge branch 'backport-exceptions-argument' into 'master'Rémy Coutable2017-07-111-2/+4
* Merge branch 'fix/offline_runner_detection' into 'master'Rémy Coutable2017-07-112-3/+11
* Merge branch '34728-fix-application-setting-created-when-redis-down' into 'ma...Stan Hu2017-07-115-8/+35
* Merge branch 'jej/9-4-update-gitignore-and-license-templates' into 'master'Rémy Coutable2017-07-114-20/+25
* Merge branch 'jej/update-source-install-instructions-for-9-4' into 'master'Achilleas Pipinellis2017-07-111-2/+2
* Merge branch 'jej/create-update-instructions-for-9-4' into 'master'Achilleas Pipinellis2017-07-111-12/+33
* 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