Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

@@ -14,6 +14,7 @@ v 8.1.0 (unreleased)
   - Add notes and SSL verification entries to hook APIs (Ben Boeckel)
   - Fix grammar in admin area "labels" .nothing-here-block when no labels exist.
   - Move CI runners page to project settings area
+  - Move CI variables page to project settings area
 
 v 8.0.3
   - Fix URL shown in Slack notifications

app/controllers/ci/variables_controller.rb

-module Ci
-  class VariablesController < Ci::ApplicationController
-    before_action :authenticate_user!
-    before_action :project
-    before_action :authorize_access_project!
-    before_action :authorize_manage_project!
-
-    layout 'ci/project'
-
-    def show
-    end
-
-    def update
-      if project.update_attributes(project_params)
-        Ci::EventService.new.change_project_settings(current_user, project)
-
-        redirect_to ci_project_variables_path(project), notice: 'Variables were successfully updated.'
-      else
-        render action: 'show'
-      end
-    end
-
-    private
-
-    def project
-      @project ||= Ci::Project.find(params[:project_id])
-    end
-
-    def project_params
-      params.require(:project).permit({ variables_attributes: [:id, :key, :value, :_destroy] })
-    end
-  end
-end

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

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

app/controllers/projects/variables_controller.rb

+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

app/helpers/auth_helper.rb

 module AuthHelper
   PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2).freeze
-  FORM_BASED_PROVIDERS = [/\Aldap/, 'kerberos', 'crowd'].freeze
+  FORM_BASED_PROVIDERS = [/\Aldap/, 'crowd'].freeze
 
   def ldap_enabled?
     Gitlab.config.ldap.enabled

app/views/layouts/ci/_nav_project.html.haml

@@ -11,11 +11,6 @@
       %span
         Commits
         %span.count= @project.commits.count
-    = nav_link path: 'variables#show' do
-      = link_to ci_project_variables_path(@project) do
-        = icon('code fw')
-        %span
-          Variables
     = nav_link path: 'web_hooks#index' do
       = link_to ci_project_web_hooks_path(@project) do
         = icon('link fw')

app/views/layouts/nav/_project_settings.html.haml

@@ -40,3 +40,8 @@
           = icon('cog fw')
           %span
             Runners
+      = nav_link(controller: :variables) do
+        = link_to namespace_project_variables_path(@project.namespace, @project) do
+          = icon('code fw')
+          %span
+            Variables

app/views/ci/variables/show.html.haml → app/views/projects/variables/show.html.haml

@@ -9,13 +9,13 @@
 %hr
 
 
-= nested_form_for @project, url: url_for(controller: 'ci/variables', action: 'update'), html: { class: 'form-horizontal' }  do |f|
+= nested_form_for @ci_project, url: url_for(controller: 'projects/variables', action: 'update'), html: { class: 'form-horizontal' }  do |f|
   - if @project.errors.any?
     #error_explanation
-      %p.lead= "#{pluralize(@project.errors.count, "error")} prohibited this project from being saved:"
+      %p.lead= "#{pluralize(@ci_project.errors.count, "error")} prohibited this project from being saved:"
       .alert.alert-error
         %ul
-          - @project.errors.full_messages.each do |msg|
+          - @ci_project.errors.full_messages.each do |msg|
             %li= msg
 
   = f.fields_for :variables do |variable_form|

config/routes.rb

@@ -58,7 +58,6 @@ Gitlab::Application.routes.draw do
       resources :runner_projects, only: [:create, :destroy]
 
       resources :events, only: [:index]
-      resource :variables, only: [:show, :update]
     end
 
     resource :user_sessions do
@@ -591,6 +590,7 @@ Gitlab::Application.routes.draw do
         resources :branches, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
         resources :tags, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
         resources :protected_branches, only: [:index, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
+        resource :variables, only: [:show, :update]
 
         resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do
           member do

spec/features/ci/variables_spec.rb → spec/features/variables_spec.rb

@@ -2,19 +2,17 @@ require 'spec_helper'
 
 describe "Variables" do
   let(:user) { create(:user) }
-
-  before do
-    login_as(user)
-  end
+  before { login_as(user) }
 
   describe "specific runners" do
     before do
       @project = FactoryGirl.create :ci_project
-      @project.gl_project.team << [user, :master]
+      @gl_project = @project.gl_project
+      @gl_project.team << [user, :master]
     end
 
     it "creates variable", js: true do
-      visit ci_project_variables_path(@project)
+      visit namespace_project_variables_path(@gl_project.namespace, @gl_project)
       click_on "Add a variable"
       fill_in "Key", with: "SECRET_KEY"
       fill_in "Value", with: "SECRET_VALUE"
@@ -23,6 +21,5 @@ describe "Variables" do
       expect(page).to have_content("Variables were successfully updated.")
       expect(@project.variables.count).to eq(1)
     end
-
   end
 end