diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 10:02:42 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 10:02:42 +0000 |
| commit | 08a484e2b179a0f4a75df3cda4d713dee6f82725 (patch) | |
| tree | 27349365b76336fe6c78083e5545198866127343 /app/controllers/projects_controller.rb | |
| parent | 5be8be7d1965476ced2841dd4c3592ba8db84423 (diff) | |
| parent | edf9620bfb1ceca4d90303028012b7fa6672fe9f (diff) | |
| download | gitlab-ci-08a484e2b179a0f4a75df3cda4d713dee6f82725.tar.gz | |
Merge branch 'project-runners-page' into 'master'
Improved runner page for project
Tasks:
- [x] Ability to add runner to several projects
- [x] Render runner status (online, offline, disabled)
- [x] Two column style of page: specific and shared runners
- [x] Toggle shared runners for project
- [x] Fix tests
- [x] Write tests for new functionality
- [x] Remove runner instead disabling if it is last project for this runner
- [x] Cleanup and refactor code
- [x] Improve query for authorised runners (reject duplicates)
- [x] Improve UI based on https://dev.gitlab.org/gitlab/gitlab-ci/issues/185#note_41582
See merge request !61
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index dfeb091..f10d42b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -2,9 +2,9 @@ class ProjectsController < ApplicationController PROJECTS_PER_PAGE = 100 before_filter :authenticate_user!, except: [:build, :badge, :index, :show] - before_filter :project, only: [:build, :integration, :show, :badge, :edit, :update, :destroy] + before_filter :project, only: [:build, :integration, :show, :badge, :edit, :update, :destroy, :toggle_shared_runners] before_filter :authorize_access_project!, except: [:build, :gitlab, :badge, :index, :show, :new, :create] - before_filter :authorize_manage_project!, only: [:edit, :integration, :update, :destroy] + before_filter :authorize_manage_project!, only: [:edit, :integration, :update, :destroy, :toggle_shared_runners] before_filter :authenticate_token!, only: [:build] before_filter :no_cache, only: [:badge] protect_from_forgery except: :build @@ -65,7 +65,6 @@ class ProjectsController < ApplicationController def update if project.update_attributes(project_params) - EventService.new.change_project_settings(current_user, project) redirect_to :back, notice: 'Project was successfully updated.' @@ -101,6 +100,11 @@ class ProjectsController < ApplicationController send_file image.path, filename: image.name, disposition: 'inline' end + def toggle_shared_runners + project.toggle!(:shared_runners_enabled) + redirect_to :back + end + protected def project |