summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Reduce parallelization of Spinach jobs and increase the RSpec ones34911-balance-spinach-jobs-to-rspecRémy Coutable2017-07-101-63/+63
* Merge branch 'revert_bootsnap' into 'master'Robert Speicher2017-07-104-15/+0
|\
| * Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"Marin Jankovski2017-07-104-15/+0
* | Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'Sean McGivern2017-07-107-41/+145
|\ \
| * | Add spec for IssuableMetadata modulesh-optimize-mr-api-emojis-and-labelsStan Hu2017-07-081-0/+59
| * | Add spec for N+1 queriesStan Hu2017-07-081-0/+12
| * | Remove remaining N+1 queries in merge requests API with emojis and labelsStan Hu2017-07-086-41/+74
* | | Merge branch '34728-fix-application-setting-created-when-redis-down' into 'ma...Stan Hu2017-07-105-8/+35
|\ \ \ | |_|/ |/| |
| * | Prevent bad data being added to application settings when Redis is unavailableNick Thomas2017-07-105-8/+35
* | | Merge branch '34891-follow-up-feature-group' into 'master'Sean McGivern2017-07-102-0/+8
|\ \ \ | |/ / |/| |
| * | Re-add Feature.register_feature_groups which is already documentedRémy Coutable2017-07-102-0/+8
|/ /
* | Merge branch 'fix/gb/qa/configure-headless-chrome-screenshots' into 'master'Rémy Coutable2017-07-101-0/+4
|\ \
| * | Configure headless chrome screenshots correctlyfix/gb/qa/configure-headless-chrome-screenshotsGrzegorz Bizon2017-07-101-0/+4
* | | Merge branch 'backstage/gb/qa/increase-qa-screenshots-size' into 'master'Rémy Coutable2017-07-101-13/+1
|\ \ \
| * | | Increase GitLab QA screenshots sizeGrzegorz Bizon2017-07-101-13/+1
| |/ /
* | | Merge branch 'backport-exceptions-argument' into 'master'Rémy Coutable2017-07-101-2/+4
|\ \ \
| * | | Allow passing exceptions when creating project servicesbackport-exceptions-argumentSean McGivern2017-07-101-2/+4
* | | | Merge branch 'fix/gb/qa/fix-test-scenario-for-adding-a-project' into 'master'Rémy Coutable2017-07-104-19/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix QA test scenario for creating a new projectGrzegorz Bizon2017-07-104-19/+8
|/ / /
* | | Merge branch 'fix/offline_runner_detection' into 'master'Rémy Coutable2017-07-102-3/+11
|\ \ \
| * | | Fix offline runner detectionAlessio Caiazza2017-07-072-3/+11
* | | | Merge branch 'docs/exclude-gitlab-git-test' into 'master'Rémy Coutable2017-07-101-0/+1
|\ \ \ \
| * | | | Exclude gitlab_git_test from docs only changesdocs/exclude-gitlab-git-testAchilleas Pipinellis2017-07-071-0/+1
* | | | | 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 '34810-vue-pagination' into 'master'Phil Hughes2017-07-104-137/+188
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Update tests to test what the component renders and what the clicks calls34810-vue-paginationFilipa Lacerda2017-07-073-161/+179
| * | | | | Use vue .prevent to prevent the clickFilipa Lacerda2017-07-071-3/+1
| * | | | | Prevent default click since we change the url manuallyFilipa Lacerda2017-07-073-6/+41
* | | | | | 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
| |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status