diff options
author | Raffael Schmid <raf@nine.ch> | 2014-01-23 13:55:26 +0400 |
---|---|---|
committer | Raffael Schmid <raf@nine.ch> | 2014-01-23 13:55:26 +0400 |
commit | 7863319b97498a7621815cfe5691794ecb86b8c5 (patch) | |
tree | 5ae991fe7543bcb91e9257242e87849538b33214 /config | |
parent | 568d1c27c5a1b4d6749943240cdba2625eee2b6e (diff) | |
parent | 68590fddd860c5d840d8f04314ed11f0d02ddd44 (diff) |
Merge branch 'master' into dont-depend-on-appid-and-appsecret
* master: (238 commits)
Version 6.5.1
Fix selectbox when submit MR from fork to origin
Fix HELP layout
No need for code tag here.
Spelling mistake and add links.
Warn against RVM.
Remove GitHub mention because we also have a GitLab issue tracker now.
Replace 6.0-to-6.4.md with 6.0-to-6.5.md
Add public assets to gitignore
Version 6.5.0
Use 6-5 branch in installation docs
Remove deprecated twitter handle.
Further explain userPrincipalName settings
Update from 6.4 to 6.5 guide
Explain how to use AD userPrincipalName for logins
More entries to CHANGELOG. Version to rc1
Rephrase LDAP check script output
add O'Reilly sponsorship in CHANGELOG
Fix select2 css for drop above style
Rename "Website url" labels to "Website"
...
Diffstat (limited to 'config')
-rw-r--r-- | config/application.rb | 1 | ||||
-rw-r--r-- | config/gitlab.yml.example | 18 | ||||
-rw-r--r-- | config/initializers/devise_password_length.rb.example | 6 | ||||
-rw-r--r-- | config/routes.rb | 3 |
4 files changed, 23 insertions, 5 deletions
diff --git a/config/application.rb b/config/application.rb index 1c91134f524..88759ce7cf3 100644 --- a/config/application.rb +++ b/config/application.rb @@ -38,6 +38,7 @@ module Gitlab # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de + config.i18n.enforce_available_locales = false # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8" diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 2bc984c9294..c63e8cb7ded 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -65,7 +65,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: @@ -116,8 +116,8 @@ production: &base # ========================== ## LDAP settings - # You can inspect the first 100 LDAP users with login access by running: - # bundle exec rake gitlab:ldap:check[100] RAILS_ENV=production + # You can inspect a sample of the LDAP users with login access by running: + # bundle exec rake gitlab:ldap:check RAILS_ENV=production ldap: enabled: false host: '_your_ldap_server' @@ -127,6 +127,15 @@ production: &base method: 'ssl' # "ssl" or "plain" bind_dn: '_the_full_dn_of_the_user_you_will_bind_with' password: '_the_password_of_the_bind_user' + # 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: true ## OmniAuth settings @@ -154,7 +163,8 @@ production: &base # - { name: 'twitter', app_id: 'YOUR APP ID', # app_secret: 'YOUR APP SECRET'} # - { name: 'github', app_id: 'YOUR APP ID', - # app_secret: 'YOUR APP SECRET' } + # app_secret: 'YOUR APP SECRET', + # args: { scope: 'user:email' } } diff --git a/config/initializers/devise_password_length.rb.example b/config/initializers/devise_password_length.rb.example new file mode 100644 index 00000000000..97305825e07 --- /dev/null +++ b/config/initializers/devise_password_length.rb.example @@ -0,0 +1,6 @@ +Devise.setup do |config| + # The following line changes the password length limits for new users. In the + # example below the minimum length is 12 characters, and the maximum length + # is 128 characters. + config.password_length = 12..128 +end diff --git a/config/routes.rb b/config/routes.rb index 8322d6a9d4e..315c339016b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,7 @@ Gitlab::Application.routes.draw do # Search # get 'search' => "search#show" + get 'search/autocomplete' => "search#autocomplete", as: :search_autocomplete # API API::API.logger Rails.logger @@ -217,7 +218,7 @@ Gitlab::Application.routes.draw do resource :repository, only: [:show] do member do get "stats" - get "archive" + get "archive", constraints: { format: Gitlab::Regex.archive_formats_regex } end end |