Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Docs: search/replace "Enterprise Edition" and adjust when applicable | Marcia Ramos | 2018-02-22 | 11 | -22/+45 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'fix-500-for-invalid-upload-path' into 'master' | Sean McGivern | 2018-02-22 | 6 | -1/+40 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix 500 error when loading an invalid upload URL | Sean McGivern | 2018-02-22 | 6 | -1/+40 | |
* | | | | | | | | | Merge branch 'revert-3487441b' into 'master' | Sean McGivern | 2018-02-22 | 3 | -12/+3 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | ||||||
| * | | | | | | | | Revert "Merge branch 'tc-info-version-check' into 'master'"revert-3487441b | Victor Wu | 2018-02-21 | 3 | -12/+3 | |
* | | | | | | | | | Merge branch '43416-document-where-user-clone-fetch-activity-appears-in-the-l... | Achilleas Pipinellis (🌴 Feb 23 - Mar 04 🌴) | 2018-02-22 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | ||||||
| * | | | | | | | | add lines describing how to find user clone/fetch activity43416-document-where-user-clone-fetch-activity-appears-in-the-logs | Diana Stanley | 2018-02-19 | 1 | -0/+4 | |
* | | | | | | | | | Merge branch 'reduce-ce-ee-disrepancies-in-js' into 'master' | Filipa Lacerda | 2018-02-22 | 22 | -45/+59 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Harmonize CE and EE JS codereduce-ce-ee-disrepancies-in-js | Rémy Coutable | 2018-02-22 | 22 | -44/+58 | |
| * | | | | | | | | | Fix the groupLabelsPath in app/assets/javascripts/api.js | Rémy Coutable | 2018-02-22 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch '42332-actionview-template-error-366-524-out-of-range' into 'mas... | Douwe Maan | 2018-02-22 | 3 | -1/+38 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix 500 error when diff context line has broken encoding42332-actionview-template-error-366-524-out-of-range | Sean McGivern | 2018-02-22 | 3 | -1/+38 | |
* | | | | | | | | | | Merge branch '43495-spec-failure-spec-features-users_spec-rb' into 'master' | Sean McGivern | 2018-02-22 | 8 | -247/+194 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix user feature specs that were hardcoding 'user1'43495-spec-failure-spec-features-users_spec-rb | Rémy Coutable | 2018-02-22 | 8 | -247/+194 | |
* | | | | | | | | | | | Merge branch 'webpack-autoinclude' into 'master' | Jacob Schatz | 2018-02-22 | 1 | -6/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Backport of Webpack auto include for EE imports | Clement Ho | 2018-02-22 | 1 | -6/+8 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'fix-squash-with-renamed-files' into 'master' | Grzegorz Bizon | 2018-02-22 | 3 | -5/+33 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix squash with renamed filesfix-squash-with-renamed-files | Sean McGivern | 2018-02-19 | 3 | -5/+33 | |
* | | | | | | | | | | | Merge branch 'zj-branch-contains-git-message' into 'master' | Douwe Maan | 2018-02-22 | 3 | -10/+48 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Handle branch and tag names which are commit ids | Zeger-Jan van de Weg | 2018-02-21 | 3 | -10/+48 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'patch-28' into 'master' | Rémy Coutable | 2018-02-22 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Format markdown.md to comply with what it describes. | Ulf Rompe | 2018-02-22 | 1 | -2/+2 | |
* | | | | | | | | | | | | Update VERSION to 10.6.0-prev10.6.0.pre | Mark Fletcher | 2018-02-22 | 1 | -1/+1 | |
* | | | | | | | | | | | | Update CHANGELOG.md for 10.5.0 | Mark Fletcher | 2018-02-22 | 160 | -804/+192 | |
| |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'jramsay-detailed-proofreader-process-docs' into 'master' | Douwe Maan | 2018-02-22 | 1 | -3/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | No `../` is necessary for linking pages in the same directory.jramsay-detailed-proofreader-process-docs | Connor Shea | 2018-02-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | Link directly to proofreader.md | James Ramsay | 2018-02-21 | 1 | -2/+4 | |
| * | | | | | | | | | | | Add more detail to the proofreader process | James Ramsay | 2018-02-21 | 1 | -3/+20 | |
* | | | | | | | | | | | | Merge branch '42886-followup-to-new-design-for-cancel-stop-pipeline-confirmat... | Filipa Lacerda | 2018-02-22 | 6 | -152/+100 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into 42886-followup-to-new-design-for-cancel-stop-pipel...42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation | Shah El-Rahman | 2018-02-21 | 413 | -6913/+5810 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge branch 'master' into 42886-followup-to-new-design-for-cancel-stop-pipel... | Shah El-Rahman | 2018-02-16 | 13 | -55/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Remove use of callback in pipeline stop/retry modals | Shah El-Rahman | 2018-02-16 | 6 | -152/+100 | |
* | | | | | | | | | | | | | | Merge branch 'ce-gitaly-squash-in-progress' into 'master' | Grzegorz Bizon | 2018-02-22 | 4 | -2/+51 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Incorporate Gitaly's RepositoryService.IsSquashInProgress RPCce-gitaly-squash-in-progress | Alejandro RodrÃguez | 2018-02-21 | 4 | -2/+51 | |
* | | | | | | | | | | | | | | | Merge branch '43134-reduce-queries-pipelines-controller-show' into 'master' | Grzegorz Bizon | 2018-02-22 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add inverse_of pipeline -> statuses -> pipeline (#43134)43134-reduce-queries-pipelines-controller-show | Dylan Griffith | 2018-02-22 | 2 | -1/+6 | |
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'git-access-existence-check' into 'master' | Robert Speicher | 2018-02-22 | 5 | -7/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Fix repo existence check in GitAccessWiki | Jacob Vosmaer (GitLab) | 2018-02-22 | 5 | -7/+29 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'mk-improve-background-migration-specs' into 'master' | Stan Hu | 2018-02-21 | 9 | -518/+706 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Use convenient Rails helpermk-improve-background-migration-specs | Michael Kozono | 2018-02-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Prefer `table` helper in migration specs | Michael Kozono | 2018-02-20 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Move TrackUntrackedUploadsHelpers | Michael Kozono | 2018-02-20 | 6 | -132/+134 | |
| * | | | | | | | | | | | | | | Explicitly reference redefined models | Michael Kozono | 2018-02-20 | 4 | -413/+411 | |
| * | | | | | | | | | | | | | | Make :migration specs a little more robust | Michael Kozono | 2018-02-16 | 1 | -0/+16 | |
| * | | | | | | | | | | | | | | Remove more BG migration spec dependencies | Michael Kozono | 2018-02-16 | 3 | -17/+26 | |
| * | | | | | | | | | | | | | | Remove codebase dependencies from a BG migration | Michael Kozono | 2018-02-16 | 4 | -112/+275 | |
* | | | | | | | | | | | | | | | Merge branch 'dispatcher-import-batch-1' into 'master' | Jacob Schatz | 2018-02-21 | 12 | -80/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Use dynamic imports in dispatcher | Clement Ho | 2018-02-21 | 12 | -80/+20 | |
* | | | | | | | | | | | | | | | Merge branch 'minor-improvement-to-k8s-monitoring-docs' into 'master' | Marcia Ramos | 2018-02-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Improve link for CI environment variable, wording.minor-improvement-to-k8s-monitoring-docs | Joshua Lambert | 2018-02-21 | 1 | -2/+2 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |