Merge branch 'master' into ci/persist-registration-token

app/views/admin/runners/show.html.haml

@@ -60,7 +60,7 @@
                   = project.name_with_namespace
               %td
                 .pull-right
-                  = link_to 'Disable', [:admin, project.namespace, project, runner_project], method: :delete, class: 'btn btn-danger btn-xs'
+                  = link_to 'Disable', [:admin, project.namespace.becomes(Namespace), project, runner_project], method: :delete, class: 'btn btn-danger btn-xs'
 
     %table.table
       %thead

app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml

@@ -12,7 +12,7 @@
     - else
       The source branch will not be removed.
 
-  - remove_source_branch_button = @merge_request.can_remove_source_branch?(current_user) && !should_remove_source_branch
+  - remove_source_branch_button = @merge_request.can_remove_source_branch?(current_user) && !should_remove_source_branch && @merge_request.merge_user == current_user
   - user_can_cancel_automatic_merge = @merge_request.can_cancel_merge_when_build_succeeds?(current_user)
   - if remove_source_branch_button || user_can_cancel_automatic_merge
     .clearfix.prepend-top-10

app/views/projects/runners/_runner.html.haml

@@ -18,7 +18,7 @@
           - runner_project = @project.runner_projects.find_by(runner_id: runner)
           = link_to 'Disable for this project', namespace_project_runner_project_path(@project.namespace, @project, runner_project), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm'
       - elsif runner.specific?
-        = form_for [@project.namespace, @project, @project.runner_projects.new] do |f|
+        = form_for [@project.namespace.becomes(Namespace), @project, @project.runner_projects.new] do |f|
           = f.hidden_field :runner_id, value: runner.id
           = f.submit 'Enable for this project', class: 'btn btn-sm'
   .pull-right

db/migrate/20151209145909_migrate_ci_emails.rb

@@ -25,7 +25,11 @@ class MigrateCiEmails < ActiveRecord::Migration
 
   # This function escapes double-quotes and slash
   def escape_text(name)
-    "REPLACE(REPLACE(#{name}, '\\', '\\\\'), '\"', '\\\"')"
+    if Gitlab::Database.postgresql?
+      "REPLACE(REPLACE(#{name}, '\\', '\\\\'), '\"', '\\\"')"
+    else
+      "REPLACE(REPLACE(#{name}, '\\\\', '\\\\\\\\'), '\\\"', '\\\\\\\"')"
+    end
   end
 
   # This function returns 0 or 1 for column

db/migrate/20151210125930_migrate_ci_to_project.rb

@@ -27,11 +27,11 @@ class MigrateCiToProject < ActiveRecord::Migration
   def migrate_project_column(column, new_column = nil)
     new_column ||= column
     subquery = "SELECT ci_projects.#{column} FROM ci_projects WHERE projects.id = ci_projects.gitlab_id"
-    execute("UPDATE projects SET #{new_column}=(#{subquery}) WHERE #{new_column} IS NULL AND (#{subquery}) IS NOT NULL")
+    execute("UPDATE projects SET #{new_column}=(#{subquery}) WHERE (#{subquery}) IS NOT NULL")
   end
 
   def migrate_ci_service
-    subquery = "SELECT active FROM services WHERE projects.id = services.project_id AND type='GitlabCiService'"
-    execute("UPDATE projects SET builds_enabled=(#{subquery}) WHERE builds_enabled IS NULL AND (#{subquery}) IS NOT NULL")
+    subquery = "SELECT active FROM services WHERE projects.id = services.project_id AND type='GitlabCiService' LIMIT 1"
+    execute("UPDATE projects SET builds_enabled=(#{subquery}) WHERE (#{subquery}) IS NOT NULL")
   end
 end