summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch '46299-wiki-page-creation' into 'master'Filipa Lacerda2019-08-2118-211/+287
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove wiki page slug dialog step when creating wiki page See merge request gitlab-org/gitlab-ce!31362
| * | | | | | New wiki page redirects user to random slug46299-wiki-page-creationLuke Duncalfe2019-08-2118-211/+287
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we asked a user to enter a new slug before taking them to the Create Page page. As a UX improvement, we now take them to a randomly generated URI so they can begin creating their new page. https://gitlab.com/gitlab-org/gitlab-ce/issues/46299
* | | | | | Merge branch '65427-improve-system-notes-for-zoom-links' into 'master'Thong Kuah2019-08-215-12/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve system notes for Zoom links" Closes #65427 See merge request gitlab-org/gitlab-ce!31410
| * | | | | | Improve system notes for Zoom links65427-improve-system-notes-for-zoom-linksJacopo2019-08-175-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes: @user a Zoom call was added to this issue into: @user added a Zoom call to this issue Same concept appleis for "removed"
* | | | | | | Merge branch 'clarify-only-except-docs' into 'master'Evan Read2019-08-211-1/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an example to doumentation for using multiple build policies with only: and except: See merge request gitlab-org/gitlab-ce!31983
| * | | | | | | Added an example to doumentation for using multiple build policies with ↵drew2019-08-211-1/+15
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | only: and except:
* | | | | | | Merge branch 'docs-k8s-caps' into 'master'Evan Read2019-08-211-14/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update capitalization in k8s cheat sheet Closes #65816 See merge request gitlab-org/gitlab-ce!32036
| * | | | | | | Update capitalization in k8s cheat sheetMarcel Amirault2019-08-211-14/+14
|/ / / / / / /
* | | | | | | Merge branch 'docs-patch-71' into 'master'Achilleas Pipinellis2019-08-212-2/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve details about when rebase button is offered See merge request gitlab-org/gitlab-ce!29644
| * | | | | | | Improve details about when rebase button is offeredBen Bodenmiller2019-08-212-2/+8
|/ / / / / / /
* | | | | | | Merge branch 'docs/pipelines-gitaly-version-removal' into 'master'Evan Read2019-08-211-3/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Gitaly version in the docs See merge request gitlab-org/gitlab-ce!32006
| * | | | | | | Remove Gitaly version in the docsdocs/pipelines-gitaly-version-removalZeger-Jan van de Weg2019-08-201-3/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's very hard for end user to know what version of Gitaly is running, and they should not have to care about this detail either. Gitaly 1.21.0 was released before 11.9 was tagged, so it's an unsupported version too. This change removes the reference.
* | | | | | | Merge branch 'zm-rephrase-ci-docs' into 'master'Evan Read2019-08-212-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update grammar in DAG docs See merge request gitlab-org/gitlab-ce!32021
| * | | | | | | Update grammar in DAG docszm-rephrase-ci-docsZeff Morgan2019-08-202-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'winh-frontend-testing-code-blocks-docs' into 'master'Evan Read2019-08-211-8/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix code blocks in frontend testing guide (docs) See merge request gitlab-org/gitlab-ce!32002
| * | | | | | | | Fix code blocks in frontend testing guide (docs)Winnie Hellmann2019-08-211-8/+8
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-fix-soft-deletion' into 'master'Evan Read2019-08-214-4/+4
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix outdated references to soft deletion See merge request gitlab-org/gitlab-ce!31982
| * | | | | | | Fix outdated references to soft deletiondocs-fix-soft-deletionMarkus Koller2019-08-194-4/+4
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We stopped using soft deletion for issues and merge requests in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15789, and for boards we apparently never used it.
* | | | | | | Merge branch 'master' into 'master'Paul Slaughter2019-08-203-5/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove margin from user header buttons Closes #57966 See merge request gitlab-org/gitlab-ce!30878
| * | | | | | | Remove margin from user header buttonsLucy Fox2019-08-203-5/+9
|/ / / / / / /
* | | | | | | Merge branch '66066-dark-theme-style-for-expansion-on-mr-diffs' into 'master'Mike Greiling2019-08-209-21/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match syntax highlighting theme for line expansion rows Closes #66066 See merge request gitlab-org/gitlab-ce!31821
| * | | | | | | Add syntax highlighting for line expansionSamantha Ming2019-08-209-21/+42
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - dark - white - monokai - none - solarized-dark - solarized-light
* | | | | | | Merge branch 'ci-config-on-policy' into 'master'Kamil Trzciński2019-08-2022-43/+1406
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flexible Rules for CI Build config See merge request gitlab-org/gitlab-ce!29011
| * | | | | | | Introducing new Syntax for Ci::Build inclusion rulesdrew2019-08-2022-43/+1406
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added Gitlab::Ci::Config::Entry::Rules and Gitlab::Ci::Config::Entry::Rules:Rule to handle lists of Rule objects to be evalauted for job inclusion - Added `if:` and `changes:` as available Rules::Rule::Clause classes - Added Rules handling logic to Seed::Build#included? with extra specs - Use DisallowedKeysValidator to mutually exclude rules: from only:/except: on job config
* | | | | | | Merge branch 'shell-9-4-1' into 'master'Douwe Maan2019-08-201-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-shell v9.4.1 See merge request gitlab-org/gitlab-ce!32022
| * | | | | | | Use gitlab-shell v9.4.1Douwe Maan2019-08-201-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'update-babel-to-7.5.5' into 'master'Mike Greiling2019-08-203-22/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade babel to 7.5.5 See merge request gitlab-org/gitlab-ce!31819
| * | | | | | | | Upgrade babel to 7.5.5update-babel-to-7.5.5Takuya Noguchi2019-08-143-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | Merge branch 'ssh-add-no-redirect' into 'master'Achilleas Pipinellis2019-08-201-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ssh_keys docs, don't redirect stdout of ssh-add See merge request gitlab-org/gitlab-ce!31630
| * | | | | | | | | Remove inoperative >/dev/nullAlexander Oleynikov2019-08-081-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'docs-repository-languages-img' into 'master'Achilleas Pipinellis2019-08-203-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update repository languages screenshot See merge request gitlab-org/gitlab-ce!31925
| * | | | | | | | | | Update repository languages screenshotMarcel Amirault2019-08-203-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'winh-fix-mocks_helper_spec' into 'master'Mike Greiling2019-08-201-1/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix assertion in mocks_helper_spec.js See merge request gitlab-org/gitlab-ce!32005
| * | | | | | | | | | Fix assertion in mocks_helper_spec.jsWinnie Hellmann2019-08-201-1/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'sh-standardize-log-names' into 'master'Mayra Cabrera2019-08-2010-20/+36
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize remote_ip and path keys for auth.log and api_json.log Closes #66167 See merge request gitlab-org/gitlab-ce!31921
| * | | | | | | | | Standardize remote_ip and path keys for auth.log and api_json.logStan Hu2019-08-2010-20/+36
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current `auth.log` uses `fullpath` and `ip`, while `api_json.log` uses `remote_ip` and `path` for the same fields. Let's standardize these namings to make it easier for people working with the data. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66167
* | | | | | | | | Merge branch 'docs/rename-geo-pages' into 'master'Achilleas Pipinellis2019-08-202-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Harmonizes titles between two Geo landing pages See merge request gitlab-org/gitlab-ce!31944
| * | | | | | | | | Harmonizes titles between two Geo landing pagesEvan Read2019-08-202-3/+3
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Menu entries in global navigation will be updated to match.
* | | | | | | | | Merge branch 'docs-integration-screenshots' into 'master'Achilleas Pipinellis2019-08-203-7/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update project import screenshot Closes #28826 See merge request gitlab-org/gitlab-ce!31946
| * | | | | | | | | Update project import docMarcel Amirault2019-08-203-7/+7
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Update screenshot and improve text to match
* | | | | | | | | Merge branch 'docs/clarify-new-values' into 'master'Achilleas Pipinellis2019-08-201-2/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Clarify when new values are valid See merge request gitlab-org/gitlab-ce!31951
| * | | | | | | | Clarify when new values are validEvan Read2019-08-201-2/+5
|/ / / / / / / /
* | | | | | | | Merge branch '10943-css-clean-up-ee' into 'master'Annabel Dunstone Gray2019-08-201-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a height utility class See merge request gitlab-org/gitlab-ce!32019
| * | | | | | | | Adds a height utility class10943-css-clean-up-eeFilipa Lacerda2019-08-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports EE changes
* | | | | | | | | Merge branch 'da/enable-dast-using-template' into 'master'Rémy Coutable2019-08-201-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable DAST See merge request gitlab-org/gitlab-ce!31970
| * | | | | | | | | Enable DASTDennis Appelt2019-08-201-0/+10
|/ / / / / / / / /
* | | | | | | | | Merge branch 'remove-unused-security-fixtures' into 'master'Lin Jen-Shin2019-08-2018-4417/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused security fixtures Closes #62734 See merge request gitlab-org/gitlab-ce!31557
| * | | | | | | | Removed security fixtures as they are ee onlyremove-unused-security-fixturesCameron Swords2019-08-2019-5364/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These will be moved to the EE codebase.
* | | | | | | | | Merge branch 'bvl-mr-commit-note-counter' into 'master'Douwe Maan2019-08-204-14/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Count notes for commits and merge requests See merge request gitlab-org/gitlab-ce!31912
| * | | | | | | | | Count comments on notes and merge requestsBob Van Landuyt2019-08-164-14/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extends our existing `Gitlab::UsageDataCounters::NoteCounter` to also count notes on commits and merge requests