Commit fe59658c authored by Marin Jankovski's avatar Marin Jankovski

GitLab 6.5 release.

parent 412910a3
......@@ -107,7 +107,7 @@ if node['gitlab']['env'] == "development"
else
default['gitlab']['environments'] = %w{production}
default['gitlab']['url'] = "http://localhost:80/"
default['gitlab']['revision'] = "6-4-stable" # Must be branch, otherwise GitLab update will run on each chef run
default['gitlab']['revision'] = "6-5-stable" # Must be branch, otherwise GitLab update will run on each chef run
default['gitlab']['port'] = "80"
end
......
......@@ -4,7 +4,7 @@ maintainer_email 'marin@gitlab.com'
license 'MIT'
description 'Installs/Configures GitLab'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '0.6.4'
version '0.6.5'
recipe "gitlab::default", "Installation"
......
......@@ -15,7 +15,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do
expect(chef_run).to sync_git('/home/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '6-4-stable',
revision: '6-5-stable',
user: 'git',
group: 'git'
)
......@@ -51,7 +51,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do
expect(chef_run).to sync_git('/home/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '6-4-stable',
revision: '6-5-stable',
user: 'git',
group: 'git'
)
......
......@@ -64,7 +64,7 @@ production: &base
# If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
# This happens when the commit is pushed or merged into the default branch of a project.
# When not specified the default issue_closing_pattern as specified below will be used.
# issue_closing_pattern: ([Cc]lose[sd]|[Ff]ixe[sd]) +#\d+
# issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) +#\d+'
## Default project features settings
default_projects_features:
......@@ -115,7 +115,7 @@ production: &base
# ==========================
## LDAP settings
# You can inspect the first 100 LDAP users with login access by running:
# You can inspect a sample of the LDAP users with login access by running:
# bundle exec rake gitlab:ldap:check[100] RAILS_ENV=production
ldap:
enabled: <%= @ldap_config["enabled"] %>
......@@ -126,6 +126,15 @@ production: &base
method: '<%= @ldap_config["method"] %>' # "ssl" or "plain"
bind_dn: '<%= @ldap_config["bind_dn"] %>'
password: '<%= @ldap_config["password"] %>'
# If allow_username_or_email_login is enabled, GitLab will ignore everything
# after the first '@' in the LDAP username submitted by the user on login.
#
# Example:
# - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials;
# - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'.
#
# If you are using "uid: 'userPrincipalName'" on ActiveDirectory you need to
# disable this setting, because the userPrincipalName contains an '@'.
allow_username_or_email_login: <%= @ldap_config["allow_username_or_email_login"] %>
## OmniAuth settings
......
# To enable smtp email delivery for your GitLab instance do next:
# 1. Rename this file to smtp_settings.rb
# 2. Edit settings inside this file
# 3. Restart GitLab instance
#
if Rails.env.production?
Gitlab::Application.config.action_mailer.delivery_method = :smtp
ActionMailer::Base.smtp_settings = {
address: "<%= @address %>",
port: <%= @port %>,
......@@ -7,3 +15,4 @@
authentication: :<%= @authentication %>,
enable_starttls_auto: <%= @enable_starttls_auto %>
}
end
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