summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add docs for breaking changes of GitLab CI in 12.0docs/add-ci-breaking-changesSteve Azzopardi2019-06-061-0/+27
|
* Merge branch 'docs/ssot-git-topics' into 'master'Achilleas Pipinellis2019-06-064-89/+157
|\ | | | | | | | | | | | | SSoT audit fixes for some topics in git section Closes #61512 See merge request gitlab-org/gitlab-ce!28966
| * SSoT audit fixesEvan Read2019-06-064-89/+157
|/ | | | | Implements part of the single source of truth audit fixes for the topics/git section.
* Merge branch 'patch-18' into 'master'Achilleas Pipinellis2019-06-061-0/+3
|\ | | | | | | | | doc: add git mr command promotion See merge request gitlab-org/gitlab-ce!28860
| * doc: add git mr command promotionElan Ruusamäe2019-05-291-0/+3
| |
* | Merge branch 'update-psd-doc' into 'master'Achilleas Pipinellis2019-06-062-0/+5
|\ \ | | | | | | | | | | | | Update project security dashboard documentation See merge request gitlab-org/gitlab-ce!28681
| * | Update project security dashboard documentationPaul Gascou-Vaillancourt2019-06-062-0/+5
|/ /
* | Merge branch 'ce-jej/fix-git-http-with-sso-enforcement' into 'master'Jan Provaznik2019-06-064-0/+42
|\ \ | | | | | | | | | | | | Avoid setting Gitlab::Session on sessionless requests and Git HTTP See merge request gitlab-org/gitlab-ce!29146
| * | Avoid setting Gitlab::Session on Git HTTP requestsce-jej/fix-git-http-with-sso-enforcementJames Edwards-Jones2019-06-051-0/+1
| | |
| * | Avoid setting Gitlab::Session on sessionless requestsJames Edwards-Jones2019-06-053-0/+41
| | |
* | | Merge branch '9490-store-designs-in-lfs-ce' into 'master'Thong Kuah2019-06-063-60/+60
|\ \ \ | | | | | | | | | | | | | | | | CE backport for gitlab-ee!13389 (Support storing design blobs using LFS) See merge request gitlab-org/gitlab-ce!29101
| * | | CE backport for changes in EE MR 133899490-store-designs-in-lfs-ceLuke Duncalfe2019-06-063-60/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports to ce a refactor of the shared example 'a controller that can serve LFS files'. The ee MR that contains the original refactor is https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13389 The reason for the refactor was mostly the removal of the outer context as it didn't need to be there, and prevented let(:lfs_oid) from being overwritten. The shared example was also renamed to be more descriptive.
* | | | Merge branch 'docs-hackathon-3' into 'master'Evan Read2019-06-063-14/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Tweak the wording regarding artifact completion Closes #56470 See merge request gitlab-org/gitlab-ce!28880
| * | | | Docs: Tweak the wording regarding artifact completionMarcel Amirault2019-06-063-14/+17
|/ / / /
* | | | Merge branch 'qa-ml-retry-first-login-validation' into 'master'Mark Lapierre2019-06-061-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Retry the first login page validation Closes gitlab-org/quality/nightly#103 See merge request gitlab-org/gitlab-ce!29100
| * | | | Retry the first login page validationMark Lapierre2019-06-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can take longer that 60 seconds for the server to be ready to respond. Retry the login page validation twice (i.e., 3 attempts to validate the login page)
* | | | | Merge branch 'docs/ssot_issue_analytics' into 'master'Evan Read2019-06-061-7/+34
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Edit "Group analytics" for SSOT See merge request gitlab-org/gitlab-ce!29241
| * | | | Edit "Group analytics" for SSOTRussell Dickenson2019-06-061-7/+34
|/ / / /
* | | | 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