Move CI variables page to project settingsmove-variables-page

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

3 files changed, 29 insertions, 4 deletions

diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 48c922f450c..56a63ce9758 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -31,4 +31,8 @@ class Projects::ApplicationController < ApplicationController
   def ci_enabled
     return render_404 unless @project.gitlab_ci?
   end
+
+  def ci_project
+    @ci_project ||= @project.gitlab_ci_project
+  end
 end
diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb
index d59884a1dd7..6cb6e3ef6d4 100644
--- a/app/controllers/projects/runners_controller.rb
+++ b/app/controllers/projects/runners_controller.rb
@@ -55,10 +55,6 @@ class Projects::RunnersController < Projects::ApplicationController
 
   protected
 
-  def ci_project
-    @ci_project = @project.gitlab_ci_project
-  end
-
   def set_runner
     @runner ||= @ci_project.runners.find(params[:id])
   end
diff --git a/app/controllers/projects/variables_controller.rb b/app/controllers/projects/variables_controller.rb
new file mode 100644
index 00000000000..d6561a45a70
--- /dev/null
+++ b/app/controllers/projects/variables_controller.rb
@@ -0,0 +1,25 @@
+class Projects::VariablesController < Projects::ApplicationController
+  before_action :ci_project
+  before_action :authorize_admin_project!
+
+  layout 'project_settings'
+
+  def show
+  end
+
+  def update
+    if ci_project.update_attributes(project_params)
+      Ci::EventService.new.change_project_settings(current_user, ci_project)
+
+      redirect_to namespace_project_variables_path(project.namespace, project), notice: 'Variables were successfully updated.'
+    else
+      render action: 'show'
+    end
+  end
+
+  private
+
+  def project_params
+    params.require(:project).permit({ variables_attributes: [:id, :key, :value, :_destroy] })
+  end
+end