diff --git a/CHANGELOG.md b/CHANGELOG.md index 633e021adf5715a9a9255d741ba7ecafa4131b5f_Q0hBTkdFTE9HLm1k..c75c652dcea9b21b4d752378d20f1ae8bc16588a_Q0hBTkdFTE9HLm1k 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Update openssl to 1.0.1k - DEPRECATION: 'gitlab_signup_enabled', 'gitlab_signin_enabled', 'gitlab_default_projects_limit', 'gravatar_enabled' are deprecated, settings can be changed in admin section of GitLab UI - DEPRECATION: CI setting `gitlab_ci_add_committer` is deprecated. Use `gitlab_ci_add_pusher` to notify user who pushed the commit of a failing build +- DEPRECATION: 'issues_tracker_redmine', 'issues_tracker_jira' and related settings are deprecated. Configuring external issues tracker has been moved to Project Services section of GitLab UI - Change default number of unicorn workers from 2 to 3 3d3f6e632b61326f6ff0376d7151cf7cf945383b 7.8.0 diff --git a/doc/settings/gitlab.yml.md b/doc/settings/gitlab.yml.md index 633e021adf5715a9a9255d741ba7ecafa4131b5f_ZG9jL3NldHRpbmdzL2dpdGxhYi55bWwubWQ=..c75c652dcea9b21b4d752378d20f1ae8bc16588a_ZG9jL3NldHRpbmdzL2dpdGxhYi55bWwubWQ= 100644 --- a/doc/settings/gitlab.yml.md +++ b/doc/settings/gitlab.yml.md @@ -11,9 +11,9 @@ ```yaml production: &base gitlab: - default_projects_limit: 10 + default_theme: 2 ``` In `gitlab.rb`, this translates to: ```ruby @@ -15,9 +15,9 @@ ``` In `gitlab.rb`, this translates to: ```ruby -gitlab_rails['gitlab_default_projects_limit'] = 10 +gitlab_rails['gitlab_default_theme'] = 2 ``` What happens here is that we forget about `production: &base`, and join @@ -21,7 +21,7 @@ ``` What happens here is that we forget about `production: &base`, and join -`gitlab:` with `default_projects_limit:` into `gitlab_default_projects_limit`. +`gitlab:` with `default_theme:` into `gitlab_default_theme`. Note that not all `gitlab.yml` settings can be changed via `gitlab.rb` yet; see the [gitlab.yml ERB template][gitlab.yml.erb]. If you think an attribute is missing please create a merge request on the omnibus-gitlab repository. diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template index 633e021adf5715a9a9255d741ba7ecafa4131b5f_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU=..c75c652dcea9b21b4d752378d20f1ae8bc16588a_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU= 100644 --- a/files/gitlab-config-template/gitlab.rb.template +++ b/files/gitlab-config-template/gitlab.rb.template @@ -24,16 +24,6 @@ # gitlab_rails['gitlab_default_projects_features_snippets'] = false # gitlab_rails['gitlab_default_projects_features_visibility_level'] = 'private' # gitlab_rails['gitlab_repository_downloads_path'] = 'tmp/repositories' -# gitlab_rails['issues_tracker_redmine'] = false -# gitlab_rails['issues_tracker_redmine_title'] = "Redmine" -# gitlab_rails['issues_tracker_redmine_project_url'] = "http://redmine.sample/projects/:issues_tracker_id" -# gitlab_rails['issues_tracker_redmine_issues_url'] = "http://redmine.sample/issues/:id" -# gitlab_rails['issues_tracker_redmine_new_issue_url'] = "http://redmine.sample/projects/:issues_tracker_id/issues/new" -# gitlab_rails['issues_tracker_jira'] = false -# gitlab_rails['issues_tracker_jira_title'] = "Atlassian Jira" -# gitlab_rails['issues_tracker_jira_project_url'] = "http://jira.sample/issues/?jql=project=:issues_tracker_id" -# gitlab_rails['issues_tracker_jira_issues_url'] = "http://jira.sample/browse/:id" -# gitlab_rails['issues_tracker_jira_new_issue_url'] = "http://jira.sample/secure/CreateIssue.jspa" # gitlab_rails['gravatar_plain_url'] = 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon' # gitlab_rails['gravatar_ssl_url'] = 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon' # gitlab_rails['webhook_timeout'] = 10 diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 633e021adf5715a9a9255d741ba7ecafa4131b5f_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi..c75c652dcea9b21b4d752378d20f1ae8bc16588a_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -64,7 +64,6 @@ default['gitlab']['gitlab-rails']['gitlab_ssh_host'] = nil default['gitlab']['gitlab-rails']['time_zone'] = nil default['gitlab']['gitlab-rails']['gitlab_email_from'] = nil -default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = nil default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil default['gitlab']['gitlab-rails']['gitlab_default_theme'] = nil @@ -68,8 +67,6 @@ default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil default['gitlab']['gitlab-rails']['gitlab_default_theme'] = nil -default['gitlab']['gitlab-rails']['gitlab_signup_enabled'] = nil -default['gitlab']['gitlab-rails']['gitlab_signin_enabled'] = nil default['gitlab']['gitlab-rails']['gitlab_restricted_visibility_levels'] = nil default['gitlab']['gitlab-rails']['gitlab_default_projects_features_issues'] = nil default['gitlab']['gitlab-rails']['gitlab_default_projects_features_merge_requests'] = nil @@ -78,17 +75,6 @@ default['gitlab']['gitlab-rails']['gitlab_default_projects_features_snippets'] = nil default['gitlab']['gitlab-rails']['gitlab_default_projects_features_visibility_level'] = nil default['gitlab']['gitlab-rails']['gitlab_repository_downloads_path'] = nil -default['gitlab']['gitlab-rails']['issues_tracker_redmine'] = false -default['gitlab']['gitlab-rails']['issues_tracker_redmine_title'] = "Redmine" -default['gitlab']['gitlab-rails']['issues_tracker_redmine_project_url'] = "http://redmine.sample/projects/:issues_tracker_id" -default['gitlab']['gitlab-rails']['issues_tracker_redmine_issues_url'] = "http://redmine.sample/issues/:id" -default['gitlab']['gitlab-rails']['issues_tracker_redmine_new_issue_url'] = "http://redmine.sample/projects/:issues_tracker_id/issues/new" -default['gitlab']['gitlab-rails']['issues_tracker_jira'] = false -default['gitlab']['gitlab-rails']['issues_tracker_jira_title'] = "Atlassian Jira" -default['gitlab']['gitlab-rails']['issues_tracker_jira_project_url'] = "http://jira.sample/issues/?jql=project=:issues_tracker_id" -default['gitlab']['gitlab-rails']['issues_tracker_jira_issues_url'] = "http://jira.sample/browse/:id" -default['gitlab']['gitlab-rails']['issues_tracker_jira_new_issue_url'] = "http://jira.sample/secure/CreateIssue.jspa" -default['gitlab']['gitlab-rails']['gravatar_enabled'] = true default['gitlab']['gitlab-rails']['gravatar_plain_url'] = nil default['gitlab']['gitlab-rails']['gravatar_ssl_url'] = nil default['gitlab']['gitlab-rails']['ldap_enabled'] = false diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb index 633e021adf5715a9a9255d741ba7ecafa4131b5f_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvZ2l0bGFiLnltbC5lcmI=..c75c652dcea9b21b4d752378d20f1ae8bc16588a_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvZ2l0bGFiLnltbC5lcmI= 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb @@ -38,7 +38,6 @@ # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample). ## User settings - default_projects_limit: <%= @gitlab_default_projects_limit %> default_can_create_group: <%= @gitlab_default_can_create_group %> # default: true username_changing_enabled: <%= @gitlab_username_changing_enabled %> # default: true - User can change her username/namespace ## Default theme @@ -49,16 +48,6 @@ ## COLOR = 5 default_theme: <%= @gitlab_default_theme %> # default: 2 - ## Users can create accounts - # This also allows normal users to sign up for accounts themselves - # default: false - By default GitLab administrators must create all new accounts - signup_enabled: <%= @gitlab_signup_enabled %> - - ## Standard login settings - # The standard login can be disabled to force login via LDAP - # default: true - If set to false the standard login form won't be shown on the sign-in page - signin_enabled: <%= @gitlab_signin_enabled %> - # Restrict setting visibility levels for non-admin users. # The default is to allow all levels. restricted_visibility_levels: <%= @gitlab_restricted_visibility_levels unless @gitlab_restricted_visibility_levels.nil? %> @@ -87,39 +76,6 @@ # The default is 'tmp/repositories' relative to the root of the Rails app. repository_downloads_path: <%= @gitlab_repository_downloads_path %> - ## External issues trackers - issues_tracker: - <% if @issues_tracker_redmine %> - redmine: - title: "<%= @issues_tracker_redmine_title %>" - ## If not nil, link 'Issues' on project page will be replaced with this - ## Use placeholders: - ## :project_id - GitLab project identifier - ## :issues_tracker_id - Project Name or Id in external issue tracker - project_url: "<%= @issues_tracker_redmine_project_url %>" - - ## If not nil, links from /#\d/ entities from commit messages will replaced with this - ## Use placeholders: - ## :project_id - GitLab project identifier - ## :issues_tracker_id - Project Name or Id in external issue tracker - ## :id - Issue id (from commit messages) - issues_url: "<%= @issues_tracker_redmine_issues_url %>" - - ## If not nil, linkis to creating new issues will be replaced with this - ## Use placeholders: - ## :project_id - GitLab project identifier - ## :issues_tracker_id - Project Name or Id in external issue tracker - new_issue_url: "<%= @issues_tracker_redmine_new_issue_url %>" - <% end %> - - <% if @issues_tracker_jira %> - jira: - title: "<%= @issues_tracker_jira_title %>" - project_url: "<%= @issues_tracker_jira_project_url %>" - issues_url: "<%= @issues_tracker_jira_issues_url %>" - new_issue_url: "<%= @issues_tracker_jira_new_issue_url %>" - <% end %> - ## Gravatar ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html gravatar: @@ -123,7 +79,6 @@ ## Gravatar ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html gravatar: - enabled: <%= @gravatar_enabled %> # Use user avatar image from Gravatar.com (default: true) # gravatar urls: possible placeholders: %{hash} %{size} %{email} plain_url: <%= single_quote(@gravatar_plain_url) %> # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon ssl_url: <%= single_quote(@gravatar_ssl_url) %> # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon