summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix user feature specs that were hardcoding 'user1'43495-spec-failure-spec-features-users_spec-rbRémy Coutable2018-02-228-247/+194
* Merge branch 'jramsay-detailed-proofreader-process-docs' into 'master'Douwe Maan2018-02-221-3/+22
|\
| * No `../` is necessary for linking pages in the same directory.jramsay-detailed-proofreader-process-docsConnor Shea2018-02-211-1/+1
| * Link directly to proofreader.mdJames Ramsay2018-02-211-2/+4
| * Add more detail to the proofreader processJames Ramsay2018-02-211-3/+20
* | Merge branch '42886-followup-to-new-design-for-cancel-stop-pipeline-confirmat...Filipa Lacerda2018-02-226-152/+100
|\ \
| * \ Merge branch 'master' into 42886-followup-to-new-design-for-cancel-stop-pipel...42886-followup-to-new-design-for-cancel-stop-pipeline-confirmationShah El-Rahman2018-02-21413-6913/+5810
| |\ \ | | |/
| * | Merge branch 'master' into 42886-followup-to-new-design-for-cancel-stop-pipel...Shah El-Rahman2018-02-1613-55/+27
| |\ \
| * | | Remove use of callback in pipeline stop/retry modalsShah El-Rahman2018-02-166-152/+100
* | | | Merge branch 'ce-gitaly-squash-in-progress' into 'master'Grzegorz Bizon2018-02-224-2/+51
|\ \ \ \
| * | | | Incorporate Gitaly's RepositoryService.IsSquashInProgress RPCce-gitaly-squash-in-progressAlejandro Rodríguez2018-02-214-2/+51
* | | | | Merge branch '43134-reduce-queries-pipelines-controller-show' into 'master'Grzegorz Bizon2018-02-222-1/+6
|\ \ \ \ \
| * | | | | Add inverse_of pipeline -> statuses -> pipeline (#43134)43134-reduce-queries-pipelines-controller-showDylan Griffith2018-02-222-1/+6
* | | | | | Merge branch 'git-access-existence-check' into 'master'Robert Speicher2018-02-225-7/+29
|\ \ \ \ \ \
| * | | | | | Fix repo existence check in GitAccessWikiJacob Vosmaer (GitLab)2018-02-225-7/+29
|/ / / / / /
* | | | | | Merge branch 'mk-improve-background-migration-specs' into 'master'Stan Hu2018-02-219-518/+706
|\ \ \ \ \ \
| * | | | | | Use convenient Rails helpermk-improve-background-migration-specsMichael Kozono2018-02-211-1/+1
| * | | | | | Prefer `table` helper in migration specsMichael Kozono2018-02-201-1/+1
| * | | | | | Move TrackUntrackedUploadsHelpersMichael Kozono2018-02-206-132/+134
| * | | | | | Explicitly reference redefined modelsMichael Kozono2018-02-204-413/+411
| * | | | | | Make :migration specs a little more robustMichael Kozono2018-02-161-0/+16
| * | | | | | Remove more BG migration spec dependenciesMichael Kozono2018-02-163-17/+26
| * | | | | | Remove codebase dependencies from a BG migrationMichael Kozono2018-02-164-112/+275
* | | | | | | Merge branch 'dispatcher-import-batch-1' into 'master'Jacob Schatz2018-02-2112-80/+20
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Use dynamic imports in dispatcherClement Ho2018-02-2112-80/+20
* | | | | | | Merge branch 'minor-improvement-to-k8s-monitoring-docs' into 'master'Marcia Ramos2018-02-211-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Improve link for CI environment variable, wording.minor-improvement-to-k8s-monitoring-docsJoshua Lambert2018-02-211-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rest-of-dispatcher' into 'master'Clement Ho2018-02-2154-338/+319
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Rest of Dispatcher RefactorJacob Schatz2018-02-2154-338/+319
|/ / / / / /
* | | | | | Merge branch 'dispatcher-import-project' into 'master'Jacob Schatz2018-02-2112-75/+39
|\ \ \ \ \ \
| * | | | | | Use dynamic imports for project dispatcher pathsClement Ho2018-02-2112-75/+39
|/ / / / / /
* | | | | | Merge branch 'update-browser-perf-testing-example-doc' into 'master'Marcia Ramos2018-02-211-4/+14
|\ \ \ \ \ \
| * | | | | | Fix linksupdate-browser-perf-testing-example-docJoshua Lambert2018-02-201-1/+1
| * | | | | | Additional updatesJoshua Lambert2018-02-201-3/+6
| * | | | | | Doc UpdateJoshua Lambert2018-02-201-4/+11
* | | | | | | Merge branch 'ad-inline-doc-to-codequality-job' into 'master'Dmitriy Zaporozhets2018-02-212-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Optimize and improve the inline documentation for the codequality jobRémy Coutable2018-02-212-1/+4
* | | | | | | | Merge branch 'feature/#2848-display-time-tracking-totals-milestone-page' into...Clement Ho2018-02-218-22/+62
|\ \ \ \ \ \ \ \
| * | | | | | | | #28481: Display time tracking totals on milestone pageRiccardo Padovani2018-02-218-22/+62
|/ / / / / / / /
* | | | | | | | Merge branch '36847-update-update-toml-rb-to-1.0.0' into 'master'Rémy Coutable2018-02-217-8/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | 36847 - update toml-rb to 1.0.0Ken2018-02-217-8/+13
* | | | | | | | | Merge branch 'add-pagination-commit-diffs' into 'master'Robert Speicher2018-02-213-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing pagination on the commit diff endpointMaxime Roussin-Belanger2018-02-193-1/+10
* | | | | | | | | | Merge branch 'tc-info-version-check' into 'master'Sean McGivern2018-02-213-3/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add more info about data collected when version check is enabledtc-info-version-checkToon Claes2018-02-213-3/+12
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/new-project-path-input-overlapping' into 'master'Clement Ho2018-02-213-2/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix new project path input overlappingGeorge Tsiolis2018-02-143-2/+7
* | | | | | | | | | | Merge branch 'fix/change-event-body-label-font-size' into 'master'Clement Ho2018-02-216-8/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Apply new default and inline label designGeorge Tsiolis2018-02-156-8/+15
* | | | | | | | | | | | Merge branch '26039-Update-to-github-linguist5.3.x' into 'master'Robert Speicher2018-02-215-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \