Commit f7007ca6 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'fix-gitlab-capitalization-ee-only' into 'master'

Correct GitLab capitalization in EE-only files

See merge request gitlab-org/gitlab-ee!7440
parents 65123e66 5306879e
...@@ -1694,7 +1694,7 @@ Please view this file on the master branch, on stable branches it's out of date. ...@@ -1694,7 +1694,7 @@ Please view this file on the master branch, on stable branches it's out of date.
## 9.3.5 (2017-07-05) ## 9.3.5 (2017-07-05)
- Make admin mirror application setting Gitlab.com exclusive. !2307 - Make admin mirror application setting GitLab.com exclusive. !2307
- Make Geo::RepositorySyncService force create a repo. - Make Geo::RepositorySyncService force create a repo.
## 9.3.4 (2017-07-03) ## 9.3.4 (2017-07-03)
...@@ -3175,7 +3175,7 @@ Please view this file on the master branch, on stable branches it's out of date. ...@@ -3175,7 +3175,7 @@ Please view this file on the master branch, on stable branches it's out of date.
## 7.5.0 (2014-11-22) ## 7.5.0 (2014-11-22)
- Added an ability to check each author commit's email by regex - Added an ability to check each author commit's email by regex
- Added an ability to restrict commit authors to existing Gitlab users - Added an ability to restrict commit authors to existing GitLab users
- Add an option for automatic daily LDAP user sync - Add an option for automatic daily LDAP user sync
- Added git hook for preventing tag removal to API - Added git hook for preventing tag removal to API
- Added git hook for setting commit message regex to API - Added git hook for setting commit message regex to API
...@@ -3201,7 +3201,7 @@ Please view this file on the master branch, on stable branches it's out of date. ...@@ -3201,7 +3201,7 @@ Please view this file on the master branch, on stable branches it's out of date.
- Show group sharing members on /my/project/team - Show group sharing members on /my/project/team
- Improve explanation of the LDAP permission reset - Improve explanation of the LDAP permission reset
- Fix some navigation issues - Fix some navigation issues
- Added support for multiple LDAP groups per Gitlab group - Added support for multiple LDAP groups per GitLab group
## 7.2.0 (2014-08-22) ## 7.2.0 (2014-08-22)
......
# This controller's role is to mimic and rewire the Gitlab OAuth # This controller's role is to mimic and rewire the GitLab OAuth
# flow routes for Jira DVCS integration. # flow routes for Jira DVCS integration.
# See https://gitlab.com/gitlab-org/gitlab-ee/issues/2381 # See https://gitlab.com/gitlab-org/gitlab-ee/issues/2381
# #
......
...@@ -45,7 +45,7 @@ class JenkinsDeprecatedService < CiService ...@@ -45,7 +45,7 @@ class JenkinsDeprecatedService < CiService
[ [
{ type: 'text', name: 'project_url', placeholder: 'Jenkins project URL like http://jenkins.example.com/job/my-project/' }, { type: 'text', name: 'project_url', placeholder: 'Jenkins project URL like http://jenkins.example.com/job/my-project/' },
{ type: 'checkbox', name: 'multiproject_enabled', title: "Multi-project setup enabled?", { type: 'checkbox', name: 'multiproject_enabled', title: "Multi-project setup enabled?",
help: "Multi-project mode is configured in Jenkins Gitlab Hook plugin." }, help: "Multi-project mode is configured in Jenkins GitLab Hook plugin." },
{ type: 'checkbox', name: 'pass_unstable', title: 'Should unstable builds be treated as passing?', { type: 'checkbox', name: 'pass_unstable', title: 'Should unstable builds be treated as passing?',
help: 'Unstable builds will be treated as passing.' } help: 'Unstable builds will be treated as passing.' }
] ]
......
...@@ -41,7 +41,7 @@ module EE ...@@ -41,7 +41,7 @@ module EE
def log_user_changes(user, message) def log_user_changes(user, message)
::Gitlab::AppLogger.info( ::Gitlab::AppLogger.info(
"SAML(#{auth_hash.provider}) account \"#{auth_hash.uid}\" #{message} " \ "SAML(#{auth_hash.provider}) account \"#{auth_hash.uid}\" #{message} " \
"Gitlab user \"#{user.name}\" (#{user.email})" "GitLab user \"#{user.name}\" (#{user.email})"
) )
end end
......
...@@ -34,7 +34,7 @@ describe Gitlab::Middleware::ReadOnly do ...@@ -34,7 +34,7 @@ describe Gitlab::Middleware::ReadOnly do
end end
end end
context 'normal requests to a read-only Gitlab instance' do context 'normal requests to a read-only GitLab instance' do
let(:fake_app) { lambda { |env| [200, { 'Content-Type' => 'text/plain' }, ['OK']] } } let(:fake_app) { lambda { |env| [200, { 'Content-Type' => 'text/plain' }, ['OK']] } }
before do before do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment