diff options
author | Valery Sizov <vsv2711@gmail.com> | 2015-05-28 17:59:19 +0300 |
---|---|---|
committer | Valery Sizov <vsv2711@gmail.com> | 2015-06-03 16:35:57 +0300 |
commit | 2999c8b41f8272b239e4364867012c9e3d4a997a (patch) | |
tree | ea3fca536ea22c25e5ea57c11bdbc2a56da2c8fe /app/controllers | |
parent | 17a8fe8a9011cfde0a9dbe70d726c769819a9dfd (diff) | |
download | gitlab-ci-2999c8b41f8272b239e4364867012c9e3d4a997a.tar.gz |
cleaning up
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/jobs_controller.rb | 20 | ||||
-rw-r--r-- | app/controllers/projects_controller.rb | 3 |
2 files changed, 1 insertions, 22 deletions
diff --git a/app/controllers/jobs_controller.rb b/app/controllers/jobs_controller.rb deleted file mode 100644 index 7d029aa..0000000 --- a/app/controllers/jobs_controller.rb +++ /dev/null @@ -1,20 +0,0 @@ -class JobsController < ApplicationController - before_filter :authenticate_user! - before_filter :project - before_filter :authorize_access_project! - before_filter :authorize_manage_project! - - layout 'project' - - def index - end - - def deploy_jobs - end - - private - - def project - @project ||= Project.find(params[:project_id]) - end -end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index ad5b120..bad6ed2 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -122,7 +122,6 @@ class ProjectsController < ApplicationController def project_params params.require(:project).permit(:path, :timeout, :timeout_in_minutes, :default_ref, :always_build, :polling_interval, :public, :ssh_url_to_repo, :allow_git_fetch, :skip_refs, :email_recipients, - :email_add_pusher, :email_only_broken_builds, :coverage_regex, :shared_runners_enabled, :token, - { jobs_attributes: [:id, :name, :build_branches, :build_tags, :tag_list, :commands, :refs, :_destroy, :job_type] }) + :email_add_pusher, :email_only_broken_builds, :coverage_regex, :shared_runners_enabled, :token) end end |