diff --git a/CHANGELOG b/CHANGELOG
index 57567728b495e89393c5d10c519e6e80ebff2d7c..5c4634fb151c3c3a01a10329fbf93143189a3d38 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -50,6 +50,7 @@ v 7.11.0 (unreleased)
   - Add footnotes support to Markdown (Guillaume Delbergue)
   - Add current_sign_in_at to UserFull REST api.
   - Make Sidekiq MemoryKiller shutdown signal configurable
+  - Add "Create Merge Request" buttons to commits and branches pages and push event.
 
 v 7.10.2
   - Fix CI links on MR page
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index 7c20b81c0b1b434d037f4425faec9806c04972f2..c5f085c236f70d4acb35f4d9a92d77130f7fb870 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -6,11 +6,12 @@ class Projects::CompareController < Projects::ApplicationController
   before_action :authorize_download_code!
 
   def index
+    @ref = Addressable::URI.unescape(params[:to])
   end
 
   def show
     base_ref = Addressable::URI.unescape(params[:from])
-    head_ref = Addressable::URI.unescape(params[:to])
+    @ref = head_ref = Addressable::URI.unescape(params[:to])
 
     compare_result = CompareService.new.execute(
       current_user,
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 17edff68be27cf075750818b250261ee2f57cdee..28536e359e51c538e3bbfc8fe2bedef816eb7a73 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -52,13 +52,13 @@ class UploadsController < ApplicationController
 
   def upload_model
     upload_models = {
-      user: User,
-      project: Project,
-      note: Note,
-      group: Group
+      "user"    => User,
+      "project" => Project,
+      "note"    => Note,
+      "group"   => Group
     }
 
-    upload_models[params[:model].to_sym]
+    upload_models[params[:model]]
   end
 
   def upload_mount
diff --git a/app/helpers/compare_helper.rb b/app/helpers/compare_helper.rb
index 01847c6b807c1e7049d2e1f808a81185c9894de8..f1dc906cab462204754cbe163b810881e2925541 100644
--- a/app/helpers/compare_helper.rb
+++ b/app/helpers/compare_helper.rb
@@ -1,21 +1,20 @@
 module CompareHelper
-  def compare_to_mr_button?
-    @project.merge_requests_enabled &&
-      params[:from].present? &&
-      params[:to].present? &&
-      @repository.branch_names.include?(params[:from]) &&
-      @repository.branch_names.include?(params[:to]) &&
-      params[:from] != params[:to] &&
-      !@refs_are_same
+  def create_mr_button?(from = params[:from], to = params[:to], project = @project)
+    from.present? &&
+      to.present? &&
+      from != to &&
+      project.merge_requests_enabled &&
+      project.repository.branch_names.include?(from) &&
+      project.repository.branch_names.include?(to)
   end
 
-  def compare_mr_path
+  def create_mr_path(from = params[:from], to = params[:to], project = @project)
     new_namespace_project_merge_request_path(
-      @project.namespace,
-      @project,
+      project.namespace,
+      project,
       merge_request: {
-        source_branch: params[:to],
-        target_branch: params[:from]
+        source_branch: to,
+        target_branch: from
       }
     )
   end
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index 60d7978b13f07a19b2ee23445335cee072c3f6ec..1da702be384346b465d32d4a03c70ed037ebc756 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -17,15 +17,27 @@
       - few_commits.each do |commit|
         = render "events/commit", commit: commit, project: project
 
+      - create_mr = current_user == event.author && event.new_ref? && create_mr_button?(event.project.default_branch, event.ref_name, event.project)
       - if event.commits_count > 1
         %li.commits-stat
           - if event.commits_count > 2
             %span ... and #{event.commits_count - 2} more commits.
+
           - if event.md_ref?
             - from = event.commit_from
             - from_label = truncate_sha(from)
           - else
             - from = event.project.default_branch
             - from_label = from
+
           = link_to namespace_project_compare_path(event.project.namespace, event.project, from: from, to: event.commit_to) do
-            %strong Compare &rarr; #{from_label}...#{truncate_sha(event.commit_to)}
+            Compare #{from_label}...#{truncate_sha(event.commit_to)}
+
+          - if create_mr
+            or
+            = link_to create_mr_path(event.project.default_branch, event.ref_name, event.project) do
+              create a merge request
+      - elsif create_mr
+        %li.commits-stat
+          = link_to create_mr_path(event.project.default_branch, event.ref_name, event.project) do
+            Create Merge Request
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index 4e7415be4aa25f417639b959b8236c4ce35a0c6c..43412624da698af4b1797a061fb3ff423576b6e9 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -10,16 +10,19 @@
           %i.fa.fa-lock
           protected
     .pull-right
-      - if can?(current_user, :download_code, @project)
-        = render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'btn-grouped btn-group-xs'
+      - if create_mr_button?(@repository.root_ref, branch.name)
+        = link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-grouped btn-xs' do
+          = icon('plus')
+          Merge Request
+
       - if branch.name != @repository.root_ref
         = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-xs', method: :post, title: "Compare" do
-          %i.fa.fa-files-o
+          = icon("exchange")
           Compare
 
       - if can_remove_branch?(@project, branch.name)
         = link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: 'btn btn-grouped btn-xs btn-remove remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do
-          %i.fa.fa-trash-o
+          = icon("trash-o")
 
   - if commit
     %ul.list-unstyled
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index a714f5f79e0f602ffcfcc754bd61edf224bcfa62..66101f3f0da684c2da8d4eb56db78edb796263bd 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -1,6 +1,6 @@
 %ul.nav.nav-tabs
   = nav_link(controller: [:commit, :commits]) do
-    = link_to namespace_project_commits_path(@project.namespace, @project, @repository.root_ref) do
+    = link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref) do
       Commits
       %span.badge= number_with_precision(@repository.commit_count, precision: 0, delimiter: ',')
   = nav_link(controller: :compare) do
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index c8531b090a6257aaa57795f3a9af0422aa25a7d5..9682100a54cec47aeee34b4b65bd9c192b88fe71 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -8,11 +8,17 @@
 .tree-ref-holder
   = render 'shared/ref_switcher', destination: 'commits'
 
-- if current_user && current_user.private_token
-  .commits-feed-holder.hidden-xs.hidden-sm
-    = link_to namespace_project_commits_path(@project.namespace, @project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed", class: 'btn' do
-      %i.fa.fa-rss
-      Commits feed
+.commits-feed-holder.hidden-xs.hidden-sm
+  - if create_mr_button?(@repository.root_ref, @ref)
+    = link_to create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success' do
+      = icon('plus')
+      Create Merge Request
+
+  - if current_user && current_user.private_token
+    = link_to namespace_project_commits_path(@project.namespace, @project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed", class: 'prepend-left-10 btn' do
+      = icon("rss")
+      Commits Feed
+
 
 %ul.breadcrumb.repo-breadcrumb
   = commits_breadcrumbs
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml
index dfb1dded9eaf70e2c12b1a425c189fb39a9f9366..a0e904cfd8bfb0b4242bae5860f015cb3168cb6c 100644
--- a/app/views/projects/compare/_form.html.haml
+++ b/app/views/projects/compare/_form.html.haml
@@ -13,9 +13,10 @@
         = text_field_tag :to, params[:to], class: "form-control"
     &nbsp;
     = button_tag "Compare", class: "btn btn-create commits-compare-btn"
-    - if compare_to_mr_button?
-      = link_to compare_mr_path, class: 'prepend-left-10 btn' do
-        %strong Make a merge request
+    - if create_mr_button?
+      = link_to create_mr_path, class: 'prepend-left-10 btn' do
+        = icon("plus")
+        Create Merge Request
 
 
 :javascript
diff --git a/doc/development/migration_style_guide.md b/doc/development/migration_style_guide.md
index db2d8b9972128b43e82d591e8244b770bea3e62a..a102d7987deb35bc27129a10152eaa6764261ca1 100644
--- a/doc/development/migration_style_guide.md
+++ b/doc/development/migration_style_guide.md
@@ -1,17 +1,20 @@
 # Migration Style Guide
 
 When writing migrations for GitLab, you have to take into account that
-these will be ran by thousands of organizations of all sizes, some with
+these will be ran by hundreds of thousands of organizations of all sizes, some with
 many years of data in their database.
 
 In addition, having to take a server offline for a an upgrade small or big is
 a big burden for most organizations. For this reason it is important that your
-migrations are written carefully and adhere to the style guide below.
+migrations are written carefully, can be applied online and adhere to the style guide below.
 
 When writing your migrations, also consider that databases might have stale data
 or inconsistencies and guard for that. Try to make as little assumptions as possible
 about the state of the database.
 
+Please don't depend on GitLab specific code since it can change in future versions.
+If needed copy-paste GitLab code into the migration to make make it forward compatible.
+
 ## Comments in the migration
 
 Each migration you write needs to have the two following pieces of information
@@ -36,4 +39,4 @@ Your migration should be reversible. This is very important, as it should
 be possible to downgrade in case of a vulnerability or bugs.
 
 In your migration, add a comment describing how the reversibility of the
-migration was tested.
+migration was tested.
\ No newline at end of file
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index 30b1934b3630df173da4e4d74279f84e4e39e968..c888e82e207ac2476382e96bb591e12ee2a3aa1b 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -12,7 +12,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
   end
 
   step 'I click atom feed link' do
-    click_link "Feed"
+    click_link "Commits Feed"
   end
 
   step 'I see commits atom feed' do