summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | Merge branch 'tsumitsu-master-patch-1' into 'master'Achilleas Pipinellis2018-10-096-49/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs/Tsumitsu Fix render issue in GFM documentation page See merge request gitlab-org/gitlab-ce!21997
| * | | | | | | | | | | | | | | | | | | docs/Tsumitsu Fix render issue in GFM documentation pagesmit_tooned2018-10-096-49/+25
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch '52408-pip-cache-dir-to-cache-python-dependencies' into 'master'Kamil Trzciński2018-10-093-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the standard PIP_CACHE_DIR for Python dependency caching template Closes #52408 See merge request gitlab-org/gitlab-ce!22211
| * | | | | | | | | | | | | | | | | | | Use the standard PIP_CACHE_DIR for Python dependency caching templateTakuya Noguchi2018-10-093-3/+8
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | | | | | | | | | Merge branch 'docs/fix-docs-structure-links' into 'master'Achilleas Pipinellis2018-10-091-21/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix links that 404 and style changes See merge request gitlab-org/gitlab-ce!22209
| * | | | | | | | | | | | | | | | | | Fix links that 404 and style changesEvan Read2018-10-091-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Some links internal links were incorrect. - Removed some #overview anchor links, because they don't jump much content. - Made text confirm to suggested proselint and mardownlint rules.
* | | | | | | | | | | | | | | | | | | Merge branch 'sh-handle-invalid-comparison' into 'master'Douwe Maan2018-10-093-0/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject invalid branch names in repository compare controller Closes #51003 See merge request gitlab-org/gitlab-ce!22186
| * | | | | | | | | | | | | | | | | | | Reject invalid branch names in repository compare controllerStan Hu2018-10-083-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #51003
* | | | | | | | | | | | | | | | | | | | Merge branch 'rails5-user-status-spec' into 'master'Sean McGivern2018-10-092-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5: fix user edit profile clear status spec See merge request gitlab-org/gitlab-ce!22169
| * | | | | | | | | | | | | | | | | | | Rails5: fix user edit profile clear status specJasper Maes2018-10-062-0/+7
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'update-code-of-conduct' into 'master'Rémy Coutable2018-10-091-20/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to latest version of contributor-covenant. See merge request gitlab-org/gitlab-ce!21995
| * | | | | | | | | | | | | | | | | | | Update to latest version of contributor-covenantJacob Schatz2018-10-091-20/+64
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'ml-qa-skip-signup-disabled' into 'master'Rémy Coutable2018-10-095-19/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Allow the registration e2e test to be skipped See merge request gitlab-org/gitlab-ce!22205
| * | | | | | | | | | | | | | | | | | Allow the registration e2e test to be skippedMark Lapierre2018-10-085-19/+55
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If SIGNUP_DISABLED is true skip any tests with a context :skip_signup_disabled. The context is set for the registration tests. This allows the tests to be skipped when run on the staging, which doesn't allow registration
* | | | | | | | | | | | | | | | | | Merge branch 'sh-bump-rugged-0.27.5' into 'master'Robert Speicher2018-10-082-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump rugged to 0.27.5 for security fixes See merge request gitlab-org/gitlab-ce!22208
| * | | | | | | | | | | | | | | | | Bump rugged to 0.27.5 for security fixesStan Hu2018-10-082-2/+2
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See: https://github.com/libgit2/libgit2/releases
* | | | | | | | | | | | | | | | | Merge branch ↵Mike Greiling2018-10-082-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52353-keyboard-navigation-project-slug-is-not-focused-on-new-project-page' into 'master' Resolve "Keyboard navigation: "Project slug" is not focused on "New project" page" Closes #52353 See merge request gitlab-org/gitlab-ce!22198
| * | | | | | | | | | | | | | | | Focus project slug on tab navigationMartin Wortschack2018-10-082-2/+7
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'osw-remove-dead-code-on-mr-show' into 'master'Robert Speicher2018-10-084-29/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes expensive dead code on main MR page request Closes #51172 See merge request gitlab-org/gitlab-ce!22153
| * | | | | | | | | | | | | | | Remove dead code on main MR pageOswaldo Ferreira2018-10-054-29/+6
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'gt-remove-duplicate-button-from-the-md-header-toolbar' into ↵Clement Ho2018-10-082-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove duplicate button from the markdown header toolbar See merge request gitlab-org/gitlab-ce!22192
| * | | | | | | | | | | | | | | Remove duplicate button from the markdown header toolbarGeorge Tsiolis2018-10-082-2/+6
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '52193-Pipeline-graph-is-not-vertically-aligned-in-commit-page' ↵Filipa Lacerda2018-10-082-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Pipeline graph is not vertically aligned in commit page" Closes #52193 See merge request gitlab-org/gitlab-ce!22173
| * | | | | | | | | | | | | | fix vertical alignment in commit pageJohann Hubert Sonntagbauer2018-10-082-1/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sh-fix-note-comments' into 'master'Robert Speicher2018-10-081-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comments in app/models/note.rb See merge request gitlab-org/gitlab-ce!22171
| * | | | | | | | | | | | | | | Fix comments in app/models/note.rbStan Hu2018-10-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves a conflict and inconsistency with the EE version of app/models/note.rb.
* | | | | | | | | | | | | | | | Merge branch 'tpresa-update-install-docs-11-4' into 'master'Achilleas Pipinellis2018-10-083-3/+381
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update installation and update docs for 11 4 See merge request gitlab-org/gitlab-ce!22030
| * | | | | | | | | | | | | | | | Update installation and update docs for 11 4Thiago Presa2018-10-083-3/+381
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'clean-up-todos-finder' into 'master'Dmitriy Zaporozhets2018-10-0812-73/+429
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up ActiveRecord code in TodosFinder and TodoService See merge request gitlab-org/gitlab-ce!21838
| * | | | | | | | | | | | | | | | Clean up ActiveRecord code in TodoServiceYorick Peterse2018-10-0810-21/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors the TodoService class according to our code reuse guidelines. The resulting code is a wee bit more verbose, but it allows us to decouple the column names from the input, resulting in fewer changes being necessary when we change the schema. One particular noteworthy line in TodoService is the following: todos_ids = todos.update_state(state) Technically this is a violation of the guidelines, because `update_state` is a class method, which services are not supposed to use (safe for a few allowed ones). I decided to keep this, since there is no alternative. `update_state` doesn't produce a relation so it doesn't belong in a Finder, and we can't move it to another Service either. As such I opted to just use the method directly. Cases like this may happen more frequently, at which point we should update our documentation with some sort of recommendation. For now, I want to refrain from doing so until we have a few more examples.
| * | | | | | | | | | | | | | | | Clean up ActiveRecord code in TodosFinderYorick Peterse2018-10-086-54/+152
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors the TodosFinder finder according to the new code reuse rules, as enforced by the CodeReuse cops. I also changed some of the methods to use regular if statements, instead of assignments and/or early returns. This results in a more natural flow when reading the code, and it makes it harder to accidentally return the wrong result.
* | | | | | | | | | | | | | | | Merge branch 'docs/add-note-for-interactive-web-terminal-docker-executor' ↵Achilleas Pipinellis2018-10-081-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add note in docs for docker executor for interactive web terminal See merge request gitlab-org/gitlab-ce!21880
| * | | | | | | | | | | | | | | | Add note for docker executordocs/add-note-for-interactive-web-terminal-docker-executorSteve Azzopardi2018-09-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docker executor does not work the same as the others. Add a note for the users and points them to an issue that describes the issue.
* | | | | | | | | | | | | | | | | Merge branch 'docs/fix-authentication-links' into 'master'Achilleas Pipinellis2018-10-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix links to auth resources external to docs See merge request gitlab-org/gitlab-ce!22180
| * | | | | | | | | | | | | | | | Fix links to auth resources external to docsEvan Read2018-10-081-2/+2
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'patch-25' into 'master'Rémy Coutable2018-10-081-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: cleanup term settings wording See merge request gitlab-org/gitlab-ce!22162
| * | | | | | | | | | | | | | | docs: cleanup term settings wordingBen Bodenmiller2018-10-051-4/+4
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'docs/update-variables-image' into 'master'Achilleas Pipinellis2018-10-083-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace old "secret variables" image for variables with new "variables" image See merge request gitlab-org/gitlab-ce!22184
| * | | | | | | | | | | | | | | | Replace old "secret variables" image for variables docs with new "variables" ↵Nelson Chen2018-10-073-1/+1
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image
* | | | | | | | | | | | | | | | Merge branch 'Fix-pipeline-redirect' into 'master'Grzegorz Bizon2018-10-084-18/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect to the pipeline builds page when a build is canceled Closes #39161 See merge request gitlab-org/gitlab-ce!21595
| * | | | | | | | | | | | | | | Redirect to the pipeline builds page when a build is canceledEva Kadlecová2018-09-174-18/+62
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '48494-fix-merge-request-buttons-spacing' into 'master'Fatih Acet2018-10-082-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Merge request buttons spacing incorrect" Closes #48494 See merge request gitlab-org/gitlab-ce!22135
| * | | | | | | | | | | | | | | | Resolve "Merge request buttons spacing incorrect"Jacques Erasmus2018-10-082-1/+6
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'docs-pre-selected-template-link' into 'master'Achilleas Pipinellis2018-10-081-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs - Prefilled fields for new issue link See merge request gitlab-org/gitlab-ce!22082
| * | | | | | | | | | | | | | | | Docs - Prefilled fields for new issue linkVictor Wu2018-10-081-0/+18
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'docs-clarify-hook-name-values' into 'master'Achilleas Pipinellis2018-10-081-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added note to clarify values for hook-name.d See merge request gitlab-org/gitlab-ce!22165
| * | | | | | | | | | | | | | | | Move hook name note to the topAchilleas Pipinellis2018-10-081-2/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Added note to clarify values for hook-name.dJason Colyer2018-10-051-0/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'improve_qa_page_readme' into 'master'Grzegorz Bizon2018-10-081-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve QA page README See merge request gitlab-org/gitlab-ce!22176
| * | | | | | | | | | | | | | | | | Also explain explicitly what `element` doesThong Kuah2018-10-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can infer from the given examples but it is implicit.