summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Introduce service for merge request pipeline creationcreate-merge-request-create-pipeline-serviceShinya Maeda2019-06-063-25/+109
| | | | | | We don't have a way to create MR pipeline today, this is one of the headaches for users. This change is a preliminary work for the capability.
* Merge branch 'docs/ssot_group_contribution_analytics' into 'master'Evan Read2019-06-061-21/+43
|\ | | | | | | | | Edit contribution analytics for SSOT See merge request gitlab-org/gitlab-ce!29180
| * Edit contribution analytics for SSOTRussell Dickenson2019-06-061-21/+43
|/
* Merge branch 'docs-jupyter-git' into 'master'Evan Read2019-06-064-4/+33
|\ | | | | | | | | Add Jupyter git extension section See merge request gitlab-org/gitlab-ce!29078
| * Add Jupyter git extension sectionDaniel Gruesso2019-06-064-4/+33
|/
* Merge branch 'revert-1322146b' into 'master'Evan Read2019-06-061-2/+2
|\ | | | | | | | | Revert "Fix callback url" See merge request gitlab-org/gitlab-ce!29234
| * Revert "Merge branch 'patch-43' into 'master'"revert-1322146bWei-Meng Lee2019-06-061-2/+2
| | | | | | This reverts merge request !25195
* | Merge branch 'docs-its-relative-6-followup' into 'master'Evan Read2019-06-061-2/+1
|\ \ | | | | | | | | | | | | | | | | | | Docs: Update anchor to more recent section in geo db doc Closes #62768 See merge request gitlab-org/gitlab-ce!29178
| * | Docs: Update anchor to more recent section in geo db docMarcel Amirault2019-06-061-2/+1
|/ /
* | Merge branch 'patch-54' into 'master'Evan Read2019-06-061-5/+5
|\ \ | | | | | | | | | | | | Clarified the availability of docker-compose in documentation using_docker_build.md See merge request gitlab-org/gitlab-ce!27988
| * | Clarified the availability of docker-compose in documentation ↵Sven Gerlach2019-06-061-5/+5
|/ / | | | | | | using_docker_build.md
* | Merge branch 'iganbaruch-master-patch-15162' into 'master'Evan Read2019-06-061-0/+4
|\ \ | | | | | | | | | | | | Added a link to the click-through demo See merge request gitlab-org/gitlab-ce!29148
| * | Added a link to the click-through demoiganbaruch-master-patch-15162Itzik Gan Baruch2019-06-041-0/+4
| | |
* | | Merge branch 'docs/patch-67' into 'master'Evan Read2019-06-061-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Update PROCESS.md - fix grammar See merge request gitlab-org/gitlab-ce!29210
| * | | Update PROCESS.md - fix grammarLucas Charles2019-06-061-2/+2
|/ / /
* | | Merge branch 'docs-request-approval-for-licenses' into 'master'Mike Lewis2019-06-061-2/+4
|\ \ \ | |_|/ |/| | | | | | | | Update docs on how to request approval for licenses/IP See merge request gitlab-org/gitlab-ce!28535
| * | Apply suggestion to doc/development/licensing.mddocs-request-approval-for-licensesJamie Hurewitz2019-06-051-1/+1
| | |
| * | Update docs on how to request approval for licenses/IPKrasimir Angelov2019-05-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit c07a6a46aba640fe0980b603f6bcaac89dc6153b Author: Jamie Hurewitz <jhurewitz@gitlab.com> Date: Sun May 5 01:02:44 2019 +0000 Update licensing.md
* | | Merge branch 'mh/notes-spec' into 'master'52494-show-functions-per-environmentMike Greiling2019-06-054-250/+291
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate old notes app test from Karma to Jest Closes #60335 See merge request gitlab-org/gitlab-ce!28704
| * | | Migrate old notes app test from Karma to JestMartin Hanzel2019-06-054-250/+291
|/ / /
* | | Merge branch 'docs-ssot-pages' into 'master'Mike Lewis2019-06-057-121/+118
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: ssot epic - Pages Closes #58178 and #61517 See merge request gitlab-org/gitlab-ce!29144
| * | | Docs: ssot epic - PagesMarcia Ramos2019-06-057-121/+118
|/ / /
* | | Merge branch 'master' into 'master'Dmitriy Zaporozhets2019-06-055-4/+34
|\ \ \ | | | | | | | | | | | | | | | | Setup Git client for Jupyter See merge request gitlab-org/gitlab-ce!28783
| * | | Setup Git client for JupyterAmit Rathi2019-06-055-4/+34
|/ / /
* | | Merge branch 'trizzi-master-patch-43016' into 'master'Dmitriy Zaporozhets2019-06-051-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Update maven template with correct link See merge request gitlab-org/gitlab-ce!29149
| * | | Update maven template with correct linktrizzi-master-patch-43016Tim Rizzi2019-06-041-2/+2
| | |/ | |/|
* | | Merge branch 'docs/clarify-2fa-grace-period' into 'master'Achilleas Pipinellis2019-06-053-19/+16
|\ \ \ | | | | | | | | | | | | | | | | Clarify and improve 2FA configuration information See merge request gitlab-org/gitlab-ce!29028
| * | | Clarify and improve 2FA configuration informationEvan Read2019-06-053-19/+16
|/ / /
* | | Merge branch 'docs-fix-note-and-links' into 'master'Achilleas Pipinellis2019-06-051-10/+4
|\ \ \ | | | | | | | | | | | | | | | | Docs: Fixes note, inline links See merge request gitlab-org/gitlab-ce!29065
| * | | Fixes note, inline linksdocs-fix-note-and-linksMarcia Ramos2019-06-031-10/+4
| | | |
* | | | Merge branch 'docs/ssot_admin_area_usage_statistics' into 'master'Achilleas Pipinellis2019-06-051-0/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Edit Admin Area's "Usage Statistics" for SSOT See merge request gitlab-org/gitlab-ce!29110
| * | | | Edit Admin Area's "Usage Statistics" for SSOTRussell Dickenson2019-06-051-0/+16
|/ / / /
* | | | Merge branch 'patch-66' into 'master'Achilleas Pipinellis2019-06-052-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | disable Rugged when switching to Gitaly without NFS See merge request gitlab-org/gitlab-ce!29086
| * | | | disable Rugged when switching to Gitaly without NFSBen Bodenmiller2019-06-052-1/+5
|/ / / /
* | | | Merge branch 'patch-33' into 'master'Achilleas Pipinellis2019-06-051-5/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | deprecate the French “écriture inclusive” See merge request gitlab-org/gitlab-ce!28861
| * | | | deprecate the French “écriture inclusive”Davy Defaud2019-06-051-5/+3
|/ / / /
* | | | Merge branch 'ee-11169-add-link-to-gemnasium-db-doc' into 'master'Achilleas Pipinellis2019-06-051-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Explain how to contribute new vulnerabilities to Dependency Scanning (docs) See merge request gitlab-org/gitlab-ce!29205
| * | | | Explain how to contribute new vulnerabilitiesFabien Catteau2019-06-051-0/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Add a link to the gemnasium-db and explain how to search for a vulnerability or contribute a new one. See https://gitlab.com/gitlab-org/gitlab-ee/issues/11169
* | | | Merge branch 'docs/clarify-group-page-icons' into 'master'Achilleas Pipinellis2019-06-051-11/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Be more specific about Groups page See merge request gitlab-org/gitlab-ce!29174
| * | | | Be more specific about Groups pageEvan Read2019-06-051-11/+17
|/ / / /
* | | | Merge branch 'docs/edit-downstream-variables' into 'master'Achilleas Pipinellis2019-06-051-5/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Edit downstream variable content See merge request gitlab-org/gitlab-ce!28853
| * | | | Edit downstream variable contentEvan Read2019-06-051-5/+6
|/ / / /
* | | | Merge branch 'jv-gitaly-rspec-catfile' into 'master'Stan Hu2019-06-051-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitaly rspec failures 'too many open files' Closes gitaly#1711 See merge request gitlab-org/gitlab-ce!29203
| * | | | Fix gitaly rspec failures 'too many open files'Jacob Vosmaer2019-06-051-0/+1
|/ / / /
* | | | Merge branch 'issue/54169' into 'master'Annabel Dunstone Gray2019-06-052-14/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | added new styling to the `.flash-warning` styles and moved the bundled style... See merge request gitlab-org/gitlab-ce!28916
| * | | | added new styling to the `.flash-warning` styles and moved the bundled style ↵Michel Engelen2019-06-052-14/+20
|/ / / / | | | | | | | | | | | | definitions up to allow overrides for specific flash-types
* | | | Merge branch 'issue_49897' into 'master'Robert Speicher2019-06-059-31/+91
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete unauthorized Todos when project is private Closes #49897 See merge request gitlab-org/gitlab-ce!28560
| * | | | Delete unauthorized Todos when project is privateissue_49897Felipe Artur2019-06-059-31/+91
| | | | | | | | | | | | | | | | | | | | | | | | | Delete Todos for guest users when project visibility level is updated to private.
* | | | | Merge branch '11204-turn-off-mask-by-default' into 'master'Mike Greiling2019-06-057-18/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default masked to false for new variables Closes gitlab-ee#11204 See merge request gitlab-org/gitlab-ce!28186
| * | | | | Default masked to false for new variables11204-turn-off-mask-by-defaultmfluharty2019-06-047-18/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the default value to false Adjust tests to expect false as the default Update documentation to make new default clear