Merge branch 'master' into new-emoji

Conflicts:
	Gemfile.lock

6 files changed, 16 insertions, 9 deletions

diff --git a/Gemfile b/Gemfile
index 506dedddb85..064ed0958a7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,7 @@ gem "browser"
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '7.0.1'
+gem "gitlab_git", '7.1.0'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack'
diff --git a/Gemfile.lock b/Gemfile.lock
index 32bbfbdc2de..65c5b2e3a03 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -213,7 +213,7 @@ GEM
       mime-types (~> 1.19)
     gitlab_emoji (0.1.0)
       gemojione (~> 2.0)
-    gitlab_git (7.0.1)
+    gitlab_git (7.1.0)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.6)
       gitlab-linguist (~> 3.0)
@@ -608,7 +608,7 @@ GEM
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
@@ -708,8 +708,13 @@ DEPENDENCIES
   gitlab-flowdock-git-hook (~> 0.4.2)
   gitlab-grack (~> 2.0.0.rc2)
   gitlab-linguist (~> 3.0.1)
+<<<<<<< HEAD
   gitlab_emoji (~> 0.1)
   gitlab_git (= 7.0.1)
+=======
+  gitlab_emoji (~> 0.0.1.1)
+  gitlab_git (= 7.1.0)
+>>>>>>> master
   gitlab_meta (= 7.0)
   gitlab_omniauth-ldap (= 1.2.0)
   gollum-lib (~> 4.0.0)
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 848cf367493..57c017e799f 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -78,10 +78,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
 
     if @merge_request.valid?
-      redirect_to(
-        merge_request_path(@merge_request),
-        notice: 'Merge request was successfully created.'
-      )
+      redirect_to(merge_request_path(@merge_request))
     else
       @source_project = @merge_request.source_project
       @target_project = @merge_request.target_project
@@ -97,8 +94,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
         format.js
         format.html do
           redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
-                       @merge_request.target_project, @merge_request],
-                      notice: 'Merge request was successfully updated.')
+                       @merge_request.target_project, @merge_request])
         end
         format.json do
           render json: {
diff --git a/doc/release/monthly.md b/doc/release/monthly.md
index dd44c1eb860..a7e5faf2a6e 100644
--- a/doc/release/monthly.md
+++ b/doc/release/monthly.md
@@ -200,3 +200,7 @@ Consider creating a post on Hacker News.
 ## Update GitLab.com with the stable version
 
 - Deploy the package (should not need downtime because of the small difference with RC1)
+
+## Release new AMIs
+
+[Follow this guide](https://dev.gitlab.org/gitlab/AMI/blob/master/README.md)
diff --git a/doc/release/patch.md b/doc/release/patch.md
index 80afa19b6c5..5397343e715 100644
--- a/doc/release/patch.md
+++ b/doc/release/patch.md
@@ -54,3 +54,4 @@ CE=false be rake release['x.x.x']
 1. Create and publish a blog post, see [patch release blog template](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/doc/patch_release_blog_template.md)
 1. Send tweets about the release from `@gitlab`, tweet should include the most important feature that the release is addressing and link to the blog post
 1. Note in the 'GitLab X.X regressions' issue that the patch was published (CE only)
+1. [Create new AMIs](https://dev.gitlab.org/gitlab/AMI/blob/master/README.md)
diff --git a/doc/release/security.md b/doc/release/security.md
index 1575fcf2708..6ed25264498 100644
--- a/doc/release/security.md
+++ b/doc/release/security.md
@@ -18,6 +18,7 @@ Please report suspected security vulnerabilities in private to <support@gitlab.c
 1. Do the steps from [patch release document](doc/release/patch.md), starting with "Create an issue on private GitLab development server"
 1. The MR with the security fix should get a 'security' label and be assigned to the release manager
 1. Build the package for GitLab.com and do a deploy
+1. [Create new AMIs](https://dev.gitlab.org/gitlab/AMI/blob/master/README.md)
 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`