diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/jobs/_deploy_job_edit.html.haml | 8 | ||||
| -rw-r--r-- | app/views/jobs/_edit.html.haml | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2fbf3f6..3287ba4 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -66,7 +66,7 @@ class ProjectsController < ApplicationController EventService.new.change_project_settings(current_user, project) - redirect_to project, notice: 'Project was successfully updated.' + redirect_to :back, notice: 'Project was successfully updated.' else render action: "edit" end diff --git a/app/views/jobs/_deploy_job_edit.html.haml b/app/views/jobs/_deploy_job_edit.html.haml index 4a39c17..5765784 100644 --- a/app/views/jobs/_deploy_job_edit.html.haml +++ b/app/views/jobs/_deploy_job_edit.html.haml @@ -12,11 +12,11 @@ = job_form.hidden_field :job_type, value: "deploy" .form-group - = f.label :name, 'Name', class: 'control-label' + = job_form.label :name, 'Name', class: 'control-label' .col-sm-10 = job_form.text_field :name, class: 'form-control', placeholder: "Staging" .form-group - = label_tag :tag_list, class: 'control-label' do + = job_form.label :tag_list, class: 'control-label' do Tags .col-sm-10 = job_form.text_field :tag_list, class: 'form-control' @@ -25,7 +25,7 @@ Leave blank if you want this job to use any runner .form-group - = label_tag :refs, class: 'control-label' do + = job_form.label :refs, class: 'control-label' do Refs .col-sm-10 = job_form.text_field :refs, class: 'form-control', placeholder: "master, staging, feature/*, tags/testing*" @@ -35,7 +35,7 @@ Accepts strings and glob pattern syntax .form-group - = f.label :commands, 'Script', class: 'control-label' + = job_form.label :commands, 'Script', class: 'control-label' .col-sm-10 = job_form.text_area :commands, class: 'form-control', rows: 10, placeholder: "bundle exec rake spec" %p.light diff --git a/app/views/jobs/_edit.html.haml b/app/views/jobs/_edit.html.haml index c3cb6aa..d748b22 100644 --- a/app/views/jobs/_edit.html.haml +++ b/app/views/jobs/_edit.html.haml @@ -10,20 +10,20 @@ = f.fields_for :jobs do |job_form| - if job_form.object.job_type == "parallel" || job_form.object.new_record? .form-group - = f.label :name, 'Name', class: 'control-label' + = job_form.label :name, 'Name', class: 'control-label' .col-sm-10 = job_form.text_field :name, class: 'form-control', placeholder: "Ex. cucumber" .form-group - = f.label :build_branches, 'Trigger', class: 'control-label' + = job_form.label :build_branches, 'Trigger', class: 'control-label' .col-sm-10 .checkbox - = f.label :build_branches, 'Builds commits', class: '' + = job_form.label :build_branches, 'Builds commits', class: '' = job_form.check_box :build_branches .checkbox - = f.label :build_tags, 'Build tags', class: '' + = job_form.label :build_tags, 'Build tags', class: '' = job_form.check_box :build_tags .form-group - = label_tag :tag_list, class: 'control-label' do + = job_form.label :tag_list, class: 'control-label' do Tags .col-sm-10 = job_form.text_field :tag_list, class: 'form-control' @@ -32,7 +32,7 @@ Leave blank if you want this job to use any runner .form-group - = f.label :commands, 'Script', class: 'control-label' + = job_form.label :commands, 'Script', class: 'control-label' .col-sm-10 = job_form.text_area :commands, class: 'form-control', rows: 10, placeholder: "bundle exec rake spec" %p.light |