summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean <jean.fobe@usp.br>2019-04-05 22:46:48 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-04-05 22:46:48 +0000
commit3ec625275875608eb91d60fa6644afa48f23abfd (patch)
tree27f390ea4bad42686fc645547058545a307e2795
parent345fa58be9c58af0a5d2709986e79544f6f07049 (diff)
downloadgitlab-ce-3ec625275875608eb91d60fa6644afa48f23abfd.tar.gz
Changes button label to Run Pipeline
Button at projects/pipelines/new was 'Create pipeline' and was changed to 'Run Pipeline'
-rw-r--r--app/views/projects/pipelines/new.html.haml4
-rw-r--r--changelogs/unreleased/58835-button-run-pipeline.yml5
-rw-r--r--locale/gitlab.pot9
-rw-r--r--spec/features/projects/pipelines/pipelines_spec.rb12
4 files changed, 16 insertions, 14 deletions
diff --git a/app/views/projects/pipelines/new.html.haml b/app/views/projects/pipelines/new.html.haml
index 41fe704601e..bfcaa09ae8c 100644
--- a/app/views/projects/pipelines/new.html.haml
+++ b/app/views/projects/pipelines/new.html.haml
@@ -10,7 +10,7 @@
= form_errors(@pipeline)
.form-group.row
.col-sm-12
- = f.label :ref, s_('Pipeline|Create for'), class: 'col-form-label'
+ = f.label :ref, s_('Pipeline|Run for'), class: 'col-form-label'
= hidden_field_tag 'pipeline[ref]', params[:ref] || @project.default_branch
= dropdown_tag(params[:ref] || @project.default_branch,
options: { toggle_class: 'js-branch-select wide monospace',
@@ -28,7 +28,7 @@
= (s_("Pipeline|Specify variable values to be used in this run. The values specified in %{settings_link} will be used by default.") % {settings_link: settings_link}).html_safe
.form-actions
- = f.submit s_('Pipeline|Create pipeline'), class: 'btn btn-success js-variables-save-button', tabindex: 3
+ = f.submit s_('Pipeline|Run Pipeline'), class: 'btn btn-success js-variables-save-button', tabindex: 3
= link_to _('Cancel'), project_pipelines_path(@project), class: 'btn btn-default float-right'
-# haml-lint:disable InlineJavaScript
diff --git a/changelogs/unreleased/58835-button-run-pipeline.yml b/changelogs/unreleased/58835-button-run-pipeline.yml
new file mode 100644
index 00000000000..39407a60780
--- /dev/null
+++ b/changelogs/unreleased/58835-button-run-pipeline.yml
@@ -0,0 +1,5 @@
+---
+title: Changed button label at /pipelines/new
+merge_request: 26893
+author: antfobe,leonardofl
+type: other
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 139272d5f7b..4e756cf2095 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -5947,12 +5947,6 @@ msgstr ""
msgid "Pipeline|Coverage"
msgstr ""
-msgid "Pipeline|Create for"
-msgstr ""
-
-msgid "Pipeline|Create pipeline"
-msgstr ""
-
msgid "Pipeline|Duration"
msgstr ""
@@ -5965,6 +5959,9 @@ msgstr ""
msgid "Pipeline|Run Pipeline"
msgstr ""
+msgid "Pipeline|Run for"
+msgstr ""
+
msgid "Pipeline|Search branches"
msgstr ""
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index cb14db7665d..de780f13681 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -685,7 +685,7 @@ describe 'Pipelines', :js do
end
it 'creates a new pipeline' do
- expect { click_on 'Create pipeline' }
+ expect { click_on 'Run Pipeline' }
.to change { Ci::Pipeline.count }.by(1)
expect(Ci::Pipeline.last).to be_web
@@ -698,7 +698,7 @@ describe 'Pipelines', :js do
fill_in "Input variable value", with: "value"
end
- expect { click_on 'Create pipeline' }
+ expect { click_on 'Run Pipeline' }
.to change { Ci::Pipeline.count }.by(1)
expect(Ci::Pipeline.last.variables.map { |var| var.slice(:key, :secret_value) })
@@ -709,7 +709,7 @@ describe 'Pipelines', :js do
context 'without gitlab-ci.yml' do
before do
- click_on 'Create pipeline'
+ click_on 'Run Pipeline'
end
it { expect(page).to have_content('Missing .gitlab-ci.yml file') }
@@ -722,14 +722,14 @@ describe 'Pipelines', :js do
click_link 'master'
end
- expect { click_on 'Create pipeline' }
+ expect { click_on 'Run Pipeline' }
.to change { Ci::Pipeline.count }.by(1)
end
end
end
end
- describe 'Create pipelines' do
+ describe 'Run Pipelines' do
let(:project) { create(:project, :repository) }
before do
@@ -740,7 +740,7 @@ describe 'Pipelines', :js do
it 'has field to add a new pipeline' do
expect(page).to have_selector('.js-branch-select')
expect(find('.js-branch-select')).to have_content project.default_branch
- expect(page).to have_content('Create for')
+ expect(page).to have_content('Run for')
end
end