summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 61278-next61278-nextFilipa Lacerda2019-05-06642-1166/+19833
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (64 commits) Allow usage of quick actions for internal users Added Omniauth OpenId Connect startegy Changelog update for MR #27025, Issue #57528 Docs: Realigning scattered EE docs into CE Add troubleshooting step for older docker clients Edit regionendpoint text Docs: Change geo redirects to relative to match EE Docs: Second Attempt to realign administration/geo docs Document Prometheus app can be uninstalled Docs: Merge EE doc/administration/high_availability to CE Docs: Merge EE doc/gitlab-geo to CE Docs: Merge EE doc/user/application_security to CE Docs: Merge EE doc/​administration/​geo to CE Docs: Merge Various EE /doc dirs to CE Docs: Merge EE doc/user/project/*.md to CE Docs: Merge 4 EE doc/user/project dirs to CE Docs: Merge misc EE doc/user/project/i* dirs to CE Docs: Merge Misc EE doc/administration files and dirs to CE Docs: Merge EE doc/ci to CE Docs: Merge EE doc/user/project/issues to CE ...
| * Merge branch 'feature/omniauth_oidc_strategy' into 'master'Ash McKenzie2019-05-065-5/+118
| |\ | | | | | | | | | | | | Added Omniauth OpenID Connect strategy See merge request gitlab-org/gitlab-ce!27383
| | * Added Omniauth OpenId Connect startegyHoratiu Eugen Vlad2019-05-065-5/+118
| | |
| * | Merge branch ↵Sean McGivern2019-05-061-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | '11235-quick-actions-do-not-work-when-issues-are-opened-from-alerts-ce' into 'master' Allow usage of quick actions for internal users See merge request gitlab-org/gitlab-ce!28071
| | * | Allow usage of quick actions for internal usersPeter Leitzen2019-05-061-1/+0
| |/ / | | | | | | | | | Just prevent support bots from using quick actions in EE
| * | Merge branch 'patch-49' into 'master'Sean McGivern2019-05-063-0/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | No leading/trailing spaces when generating heading ids (Fixes #57528) Closes #57528 See merge request gitlab-org/gitlab-ce!27025
| | * | Changelog update for MR #27025, Issue #57528Willian Balmant2019-05-051-0/+5
| | | |
| | * | Use strip to remove leading/trailing spacesWillian Balmant2019-04-112-3/+2
| | | | | | | | | | | | Change based on comments in MR #27025
| | * | No leading/trailing spaces when generating heading ids (Fixes #57528)Willian Balmant2019-04-102-2/+7
| | | | | | | | | | | | Update based on comments in MR #27025
| | * | No leading/trailing spaces when generating heading ids (Fixes #57528)Willian Balmant2019-04-041-0/+2
| | | |
| * | | Merge branch 'docs-60665-uninstalling-cluster-apps' into 'master'Ash McKenzie2019-05-061-0/+21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document Prometheus app can be uninstalled Closes #60665 See merge request gitlab-org/gitlab-ce!28098
| | * | | Document Prometheus app can be uninstalleddocs-60665-uninstalling-cluster-appsThong Kuah2019-05-061-0/+21
| | | | |
| * | | | Merge branch 'sh-upgrade-rubocop-0.68.0-ce' into 'master'Ash McKenzie2019-05-0662-251/+461
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to Rubocop 0.68.1 See merge request gitlab-org/gitlab-ce!28046
| | * | | | Run rubocop -a on CE filessh-upgrade-rubocop-0.68.0-ceStan Hu2019-05-0557-83/+67
| | | | | |
| | * | | | Revert changes in lib/tasks/lint.rakeStan Hu2019-05-051-2/+15
| | | | | |
| | * | | | Update .rubocop_todo.ymlStan Hu2019-05-051-21/+20
| | | | | |
| | * | | | Regenerate Rubocop rulesStan Hu2019-05-052-123/+5
| | | | | |
| | * | | | Upgrade haml-lint to 0.30.0Stan Hu2019-05-052-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This also supports Ruby 2.6.
| | * | | | Add more HAML lint rulesStan Hu2019-05-051-0/+2
| | | | | |
| | * | | | Add exceptions to HAML lintStan Hu2019-05-051-1/+3
| | | | | |
| | * | | | Remove stdout/stderr capture in static-analysisStan Hu2019-05-051-15/+1
| | | | | |
| | * | | | Add logging for time and lint startStan Hu2019-05-051-0/+1
| | | | | |
| | * | | | Bump gitlab-styles to 2.6.2 for performanceStan Hu2019-05-051-1/+1
| | | | | |
| | * | | | Upgrade to Rubocop 0.68.1Stan Hu2019-05-054-164/+505
| | | | | | | | | | | | | | | | | | | | | | | | This adds Ruby 2.6 support.
| * | | | | Merge branch 'docs-repo-merge-redux-3-misc' into 'master'Achilleas Pipinellis2019-05-0611-75/+330
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Realigning scattered EE docs into CE See merge request gitlab-org/gitlab-ce!28102
| | * | | | | Docs: Realigning scattered EE docs into CEMarcel Amirault2019-05-0611-75/+330
| |/ / / / /
| * | | | | Merge branch 'add-registry-troubleshooting-schema1-docs' into 'master'Achilleas Pipinellis2019-05-061-0/+31
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add troubleshooting step for older docker clients to registry documentation Closes omnibus-gitlab#4195 See merge request gitlab-org/gitlab-ce!27917
| | * | | | | Add troubleshooting step for older docker clientsIan Baum2019-05-061-0/+31
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The container registry needs a compatibility setting enabled for older docker clients. This will document how to enable the setting for omnibus and source installations.
| * | | | | Merge branch 'docs/edit-regionendpoint-doc' into 'master'Achilleas Pipinellis2019-05-061-9/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit regionendpoint text See merge request gitlab-org/gitlab-ce!27928
| | * | | | | Edit regionendpoint textEvan Read2019-05-061-9/+5
| |/ / / / /
| * | | | | Merge branch 'docs-repo-merge-redux-1-geo' into 'master'Achilleas Pipinellis2019-05-0619-38/+38
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Change geo redirects to relative to match EE See merge request gitlab-org/gitlab-ce!28100
| | * | | | | Docs: Change geo redirects to relative to match EEMarcel Amirault2019-05-0619-38/+38
| |/ / / / /
| * | | | | Merge branch 'docs-repo-merge-redux-2-geo' into 'master'Achilleas Pipinellis2019-05-051-4/+71
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Second Attempt to realign administration/geo docs See merge request gitlab-org/gitlab-ce!28099
| | * | | | | Docs: Second Attempt to realign administration/geo docsMarcel Amirault2019-05-051-4/+71
| |/ / / / /
| * | | | | Merge branch 'docs-repo-merge-8-admin-ha' into 'master'Achilleas Pipinellis2019-05-0510-118/+1854
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | Docs: Merge EE doc/administration/high_availability to CE See merge request gitlab-org/gitlab-ce!27985
| | * | | | Docs: Merge EE doc/administration/high_availability to CEMarcel Amirault2019-05-0510-118/+1854
| |/ / / /
| * | | | Merge branch 'docs-repo-merge-6-geo' into 'master'Achilleas Pipinellis2019-05-0520-1/+96
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/gitlab-geo to CE See merge request gitlab-org/gitlab-ce!27656
| | * | | | Docs: Merge EE doc/gitlab-geo to CEMarcel Amirault2019-05-0520-1/+96
| |/ / / /
| * | | | Merge branch 'docs-repo-merge-22-user-app-security' into 'master'Achilleas Pipinellis2019-05-0523-0/+1411
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/user/application_security to CE See merge request gitlab-org/gitlab-ce!27945
| | * | | | Docs: Merge EE doc/user/application_security to CEMarcel Amirault2019-05-0523-0/+1411
| |/ / / /
| * | | | Merge branch 'docs-repo-merge-7-admin-geo' into 'master'Achilleas Pipinellis2019-05-0528-0/+4329
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/​administration/​geo to CE See merge request gitlab-org/gitlab-ce!27660
| | * | | | Docs: Merge EE doc/​administration/​geo to CEMarcel Amirault2019-05-0528-0/+4329
| |/ / / /
| * | | | Merge branch 'docs-repo-merge-29-misc' into 'master'Achilleas Pipinellis2019-05-0519-21/+305
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge Various EE /doc dirs to CE See merge request gitlab-org/gitlab-ce!28043
| | * | | | Docs: Merge Various EE /doc dirs to CEMarcel Amirault2019-05-0519-21/+305
| |/ / / /
| * | | | Merge branch 'docs-repo-merge-26-project-misc' into 'master'Achilleas Pipinellis2019-05-0535-10/+673
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/user/project/*.md to CE See merge request gitlab-org/gitlab-ce!27984
| | * | | | Docs: Merge EE doc/user/project/*.md to CEMarcel Amirault2019-05-0535-10/+673
| |/ / / /
| * | | | Merge branch 'docs-repo-merge-28-project-ops' into 'master'Achilleas Pipinellis2019-05-0513-4/+808
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge 4 EE doc/user/project dirs to CE See merge request gitlab-org/gitlab-ce!27982
| | * | | | Docs: Merge 4 EE doc/user/project dirs to CEMarcel Amirault2019-05-0513-4/+808
| |/ / / /
| * | | | Merge branch 'docs-repo-merge-27-project-i' into 'master'Achilleas Pipinellis2019-05-0525-2/+558
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge misc EE doc/user/project/i* dirs to CE See merge request gitlab-org/gitlab-ce!27980
| | * | | | Docs: Merge misc EE doc/user/project/i* dirs to CEMarcel Amirault2019-05-0525-2/+558
| |/ / / /