Merge branch 'master' into backport-issues-controller-changesbackport-issues-controller-changes

4 files changed, 15 insertions, 8 deletions

diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb
index 109418c73f7..d60a24d3f1d 100644
--- a/app/controllers/projects/merge_requests/diffs_controller.rb
+++ b/app/controllers/projects/merge_requests/diffs_controller.rb
@@ -27,7 +27,7 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
         @merge_request.merge_request_diff
       end
 
-    @merge_request_diffs = @merge_request.merge_request_diffs.viewable.select_without_diff
+    @merge_request_diffs = @merge_request.merge_request_diffs.viewable.select_without_diff.order_id_desc
     @comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id }
 
     if params[:start_sha].present?
diff --git a/app/controllers/projects/pipelines_settings_controller.rb b/app/controllers/projects/pipelines_settings_controller.rb
index 9d24ebe2138..abab2e2f0c9 100644
--- a/app/controllers/projects/pipelines_settings_controller.rb
+++ b/app/controllers/projects/pipelines_settings_controller.rb
@@ -6,7 +6,7 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
   end
 
   def update
-    if @project.update_attributes(update_params)
+    if @project.update(update_params)
       flash[:notice] = "Pipelines settings for '#{@project.name}' were successfully updated."
       redirect_to project_settings_ci_cd_path(@project)
     else
@@ -16,14 +16,12 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
 
   private
 
-  def create_params
-    params.require(:pipeline).permit(:ref)
-  end
-
   def update_params
     params.require(:project).permit(
-      :runners_token, :builds_enabled, :build_allow_git_fetch, :build_timeout_in_minutes, :build_coverage_regex,
-      :public_builds, :auto_cancel_pending_pipelines, :ci_config_path
+      :runners_token, :builds_enabled, :build_allow_git_fetch,
+      :build_timeout_in_minutes, :build_coverage_regex, :public_builds,
+      :auto_cancel_pending_pipelines, :ci_config_path,
+      auto_devops_attributes: [:id, :domain, :enabled]
     )
   end
 end
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index f8ff7413b53..d925dcd21ff 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -47,6 +47,10 @@ class Projects::ProjectMembersController < Projects::ApplicationController
     end
   end
 
+  def import
+    @projects = current_user.authorized_projects.order_id_desc
+  end
+
   def apply_import
     source_project = Project.find(params[:source_project_id])
 
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index 15a2ff56b92..b029b31f9af 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -8,6 +8,7 @@ module Projects
         define_secret_variables
         define_triggers_variables
         define_badges_variables
+        define_auto_devops_variables
       end
 
       private
@@ -42,6 +43,10 @@ module Projects
           badge.new(@project, @ref).metadata
         end
       end
+
+      def define_auto_devops_variables
+        @auto_devops = @project.auto_devops || ProjectAutoDevops.new
+      end
     end
   end
 end