7 files changed, 33 insertions, 21 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 80356beb190..72f2642727a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 6.8.0
   - Disable connection reaping for MySQL
   - Allow oauth signup without email for twitter and github
   - Fix faulty namespace names that caused 500 on user creation
+  - Option to disable standard login
 
 v 6.7.3
   - Fix the merge notification email not being sent (Pierre de La Morinerie)
diff --git a/PROCESS.md b/PROCESS.md
index f04b5b39a1a..47fd18887de 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -7,24 +7,19 @@ Below we describe the contributing process to GitLab for two reasons. So that co
 ## Common actions
 
 ### Issue team
-- Looks for issues without workflow labels and triages issue
-- Monitors merge requests
-- Closes invalid issues and merge requests with a comment (duplicates, [feature requests](#feature-requests), [fixed in newer version](#issue-fixed-in-newer-version), [issue report for old version](#issue-report-for-old-version), not a problem in GitLab, etc.)
-- Assigns appropriate [labels](#how-we-handle-issues)
-- Asks for feedback from issue reporter/merge request initiator ([invalid issue reports](#improperly-formatted-issue), [format code](#code-format), etc.)
-- Asks for feedback from the relevant developer(s) based on the [list of members and their specialities](https://www.gitlab.com/core-team/)
-- Monitors all issues/merge requests for feedback (but especially ones commented on since automatically watching them):
+- Looks for issues without [workflow labels](#how-we-handle-issues) and triages issue
+- Closes invalid issues with a comment (duplicates, [feature requests](#feature-requests), [fixed in newer version](#issue-fixed-in-newer-version), [issue report for old version](#issue-report-for-old-version), not a problem in GitLab, etc.)
+- Asks for feedback from issue reporter ([invalid issue reports](#improperly-formatted-issue), [format code](#code-format), etc.)
+- Monitors all issues for feedback (but especially ones commented on since automatically watching them)
 - Closes issues with no feedback from the reporter for two weeks
-- Closes stale merge requests
 
-### Development team
+### Merge request officers
 
-- Responds to issues and merge requests the issue team mentions them in
-- Monitors for new issues in _Awaiting developer action/feedback_ with no developer activity (once a week)
-- Monitors for new merge requests (at least once a week)
-- Manages their work queue by looking at issues and merge requests assigned to them
-- Close fixed issues (via commit messages or manually)
-- Be kind to people trying to contribute. Be aware that people can be a non-native or a native English speaker, they might not understand thing or they might be very sensitive to how your word things. Use emoji to express your feelings (heart, star, smile, etc.). Some good tips about giving feedback to merge requests is in the [Thoughtbot code review guide](https://github.com/thoughtbot/guides/tree/master/code-review).
+- Responds to merge requests the issue team mentions them in and monitors for new merge requests
+- Provides feedback to the merge request submitter to improve the merge request (style, tests, etc.)
+- Mark merge requests 'ready-for-merge' when they meet the contribution guidelines
+- Mention developer(s) based on the [list of members and their specialities](https://www.gitlab.com/core-team/)
+- Closes merge requests with no feedback from the reporter for two weeks
 
 ## Priorities of the issue team
 
@@ -63,6 +58,10 @@ If an issue is complex and needs the attention of a specific person, assignment
   - Feature request (see copy & paste response: [Feature requests](#feature-requests))
   - Support (see copy & paste response: [Support requests and configuration questions](#support-requests-and-configuration-questions)
 
+## Be kind
+
+Be kind to people trying to contribute. Be aware that people can be a non-native or a native English speaker, they might not understand thing or they might be very sensitive to how your word things. Use emoji to express your feelings (heart, star, smile, etc.). Some good tips about giving feedback to merge requests is in the [Thoughtbot code review guide](https://github.com/thoughtbot/guides/tree/master/code-review).
+
 ## Copy & paste responses
 
 ### Improperly formatted issue
diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
index a863b318324..c43d26385f7 100644
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -18,7 +18,7 @@ class Projects::HooksController < Projects::ApplicationController
     if @hook.valid?
       redirect_to project_hooks_path(@project)
     else
-      @hooks = @project.hooks
+      @hooks = @project.hooks.select(&:persisted?)
       render :index
     end
   end
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index bb87d9ecb4a..31221ae9c37 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,6 +1,6 @@
 .login-box
   %h3.page-title Sign in
-  - if ldap_enabled?
+  - if ldap_enabled? && gitlab_config.signin_enabled
     %ul.nav.nav-tabs
       %li.active
         = link_to 'LDAP', '#tab-ldap', 'data-toggle' => 'tab'
@@ -12,11 +12,18 @@
       %div#tab-signin.tab-pane
         = render partial: 'devise/sessions/new_base'
 
-  - else
+  - elsif ldap_enabled?
+    = render partial: 'devise/sessions/new_ldap'
+
+  - elsif gitlab_config.signin_enabled
     = render partial: 'devise/sessions/new_base'
 
+  - else
+    %div
+      No authentication methods configured.
+
 
-  = render 'devise/sessions/oauth_providers' if devise_mapping.omniauthable?
+  = render 'devise/sessions/oauth_providers' if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable?
   %hr
 
   - if gitlab_config.signup_enabled
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index d9ac1c02ef5..3b1427cba70 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -54,8 +54,12 @@ production: &base
 
 
     ## Users management
-    # default: false - Account passwords are not sent via the email if signup is enabled. 
+    # default: false - Account passwords are not sent via the email if signup is enabled.
     # signup_enabled: true
+    #
+    # default: true - If set to false, standard login form won't be shown on the sign-in page
+    # signin_enabled: false
+
 
     # Restrict setting visibility levels for non-admin users.
     # The default is to allow all levels.
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 70ba26cea7a..ce672372a3d 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -87,6 +87,7 @@ rescue ArgumentError # no user configured
   '/home/' + Settings.gitlab['user']
 end
 Settings.gitlab['signup_enabled'] ||= false
+Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
 Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
 Settings.gitlab['issue_closing_pattern'] = '([Cc]loses|[Ff]ixes) #(\d+)' if Settings.gitlab['issue_closing_pattern'].nil?
diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake
index 853994dd67d..f988479f574 100644
--- a/lib/tasks/gitlab/setup.rake
+++ b/lib/tasks/gitlab/setup.rake
@@ -16,7 +16,7 @@ namespace :gitlab do
 
     Rake::Task["db:setup"].invoke
 
-    config = YAML.load_file(File.join(Rails.root,'config','database.yml'))[Rails.env]
+    config = YAML.load(ERB.new(File.read(File.join(Rails.root, "config","database.yml"))).result)
     success = case config["adapter"]
               when /^mysql/ then
                 Rake::Task["add_limits_mysql"].invoke