Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1-0

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/projects_controller.rb

VERSION

-7.1.0.rc1-ee
+7.1.0-ee

app/controllers/projects_controller.rb

@@ -189,7 +189,7 @@ class ProjectsController < ApplicationController
   def project_params
     params.require(:project).permit(
       :name, :path, :description, :issues_tracker, :label_list,
-      :issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id,
+      :issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, :default_branch,
       :wiki_enabled, :visibility_level, :import_url, :last_activity_at, :namespace_id, :merge_requests_template
     )
   end

app/controllers/sessions_controller.rb

 class SessionsController < Devise::SessionsController
 
   def new
-    if request.referer.present?
-      store_location_for(:redirect, URI(request.referer).path)
-    end
+    redirect_url = if request.referer.present?
+                     referer_uri = URI(request.referer)
+                     if referer_uri.host == Gitlab.config.gitlab.host
+                       referer_uri.path
+                     else
+                       request.fullpath
+                     end
+                   else
+                     request.fullpath
+                   end
+
+    store_location_for(:redirect, redirect_url)
 
     super
   end

config/gitlab.yml.example

@@ -49,6 +49,16 @@ production: &base
     ##   COLOR  = 5
     # default_theme: 2 # 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: true
+
+    ## 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: false
+
     # Restrict setting visibility levels for non-admin users.
     # The default is to allow all levels.
     #restricted_visibility_levels: [ "public" ]
@@ -112,16 +122,6 @@ production: &base
   # 2. Auth settings
   # ==========================
 
-  ## 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: true
-
-  ## 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: false
-
   ## LDAP settings
   # You can inspect a sample of the LDAP users with login access by running:
   #   bundle exec rake gitlab:ldap:check RAILS_ENV=production

doc/release/monthly.md

@@ -262,13 +262,14 @@ Proposed tweet for CE "GitLab X.X.X CE is released! It brings *** <link-to-blogp
 
 Proposed tweet for EE "GitLab X.X.X EE is released! It brings *** <link-to-blogpost>"
 
-### **9. Send out newsletter**
-
-In MailChimp replicate the former release newsletters to customers / newsletter subscribers (these are two separate things) and modify them accordingly.
+### **9. Send out the newsletter**
 
+Send out an email to the 'GitLab Newsletter' mailing list on MailChimp.
+Replicate the former release newsletter and modify it accordingly.
 Include a link to the blog post and keep it short.
 
-Proposed email for CE: "We have released a new version of GitLab Community Edition and its packages. See our blog post(<link>) for more information."
+Proposed email text:
+"We have released a new version of GitLab. See our blog post(<link>) for more information."
 
 # **23rd - Optional Patch Release**
 

doc/release/patch.md

@@ -27,4 +27,5 @@ Otherwise include it in the monthly release and note there was a regression fix
 1. [Build new packages with the latest version](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md)
 1. Cherry-pick the changelog update back into master
 1. Send tweets about the release from `@gitlabhq`, tweet should include the most important feature that the release is addressing as well as the link to the changelog
-1. Note in the 'GitLab X.X regressions' issue that the patch was published(CE only)
+1. Note in the 'GitLab X.X regressions' issue that the patch was published (CE only)
+1. Send out an email to the 'GitLab Newsletter' mailing list on MailChimp (or the 'Subscribers' list if the patch is EE only)

doc/release/security.md

@@ -18,9 +18,8 @@ Please report suspected security vulnerabilities in private to <support@gitlab.c
 1. Create feature branches for the blog post on GitLab.com and link them from the code branch
 1. Merge and publish the blog posts
 1. Send tweets about the release from `@gitlabhq`
-1. Send out an email to the subscribers mailing list on MailChimp
+1. Send out an email to the 'GitLab Newsletter' mailing list on MailChimp (or the 'Subscribers' list if the security fix is for EE only)
 1. Send out an email to [the community google mailing list](https://groups.google.com/forum/#!forum/gitlabhq)
-1. Send out an email to [the GitLab newsletter list](http://gitlab.us5.list-manage.com/subscribe?u=498dccd07cf3e9482bee33ba4&id=98a9a4992c)
 1. Post a signed copy of our complete announcement to [oss-security](http://www.openwall.com/lists/oss-security/) and request a CVE number
 1. Add the security researcher to the [Security Researcher Acknowledgments list](http://www.gitlab.com/vulnerability-acknowledgements/)
 1. Thank the security researcher in an email for their cooperation

features/project/project.feature

@@ -36,3 +36,9 @@ Feature: Project Feature
     When I visit project "Shop" page
     Then I should see project "Shop" README link
     And I should see project "Shop" version
+
+  Scenario: I should change project default branch
+    When I visit edit project "Shop" page
+    And change project default branch
+    And I save project
+    Then I should see project default branch changed

features/steps/project/project.rb

@@ -46,4 +46,15 @@ class ProjectFeature < Spinach::FeatureSteps
       page.should have_content "Version: 2.2.0"
     end
   end
+
+  step 'change project default branch' do
+    select 'stable', from: 'project_default_branch'
+  end
+
+  step 'I should see project default branch changed' do
+    # TODO: Uncomment this when we can do real gitlab-shell calls
+    # from spinach tests. Right now gitlab-shell calls are stubbed so this test
+    # will not pass
+    # find(:css, 'select#project_default_branch').value.should == 'stable'
+  end
 end

features/steps/project/redirects.rb

@@ -17,6 +17,7 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps
   end
 
   step 'I should see project "Community" home page' do
+    Gitlab.config.gitlab.stub(:host).and_return("www.example.com")
     within '.project-home-title' do
       page.should have_content 'Community'
     end