summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | add lines describing how to find user clone/fetch activity43416-document-where-user-clone-fetch-activity-appears-in-the-logsDiana Stanley2018-02-191-0/+4
| * | | | | | | | | Merge branch 'reduce-ce-ee-disrepancies-in-js' into 'master'Filipa Lacerda2018-02-2222-45/+59
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Harmonize CE and EE JS codereduce-ce-ee-disrepancies-in-jsRémy Coutable2018-02-2222-44/+58
| | * | | | | | | | | Fix the groupLabelsPath in app/assets/javascripts/api.jsRémy Coutable2018-02-221-1/+1
| * | | | | | | | | | Merge branch '42332-actionview-template-error-366-524-out-of-range' into 'mas...Douwe Maan2018-02-223-1/+38
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix 500 error when diff context line has broken encoding42332-actionview-template-error-366-524-out-of-rangeSean McGivern2018-02-223-1/+38
| * | | | | | | | | | Merge branch '43495-spec-failure-spec-features-users_spec-rb' into 'master'Sean McGivern2018-02-228-247/+194
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix user feature specs that were hardcoding 'user1'43495-spec-failure-spec-features-users_spec-rbRémy Coutable2018-02-228-247/+194
| * | | | | | | | | | | Merge branch 'webpack-autoinclude' into 'master'Jacob Schatz2018-02-221-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Backport of Webpack auto include for EE importsClement Ho2018-02-221-6/+8
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'Grzegorz Bizon2018-02-22654-8676/+7402
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'fix-squash-with-renamed-files' into 'master'Grzegorz Bizon2018-02-223-5/+33
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix squash with renamed filesfix-squash-with-renamed-filesSean McGivern2018-02-193-5/+33
| * | | | | | | | | | | Merge branch 'zj-branch-contains-git-message' into 'master'Douwe Maan2018-02-223-10/+48
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Handle branch and tag names which are commit idsZeger-Jan van de Weg2018-02-213-10/+48
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-02-221-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Format markdown.md to comply with what it describes.Ulf Rompe2018-02-221-2/+2
| * | | | | | | | | | | | Update VERSION to 10.6.0-prev10.6.0.preMark Fletcher2018-02-221-1/+1
| * | | | | | | | | | | | Update CHANGELOG.md for 10.5.0Mark Fletcher2018-02-22160-804/+192
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \