Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7f1b7152
Commit
7f1b7152
authored
May 28, 2018
by
Fabio Busatto
Committed by
Kamil Trzciński
May 28, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Rename "secret variables" to "variables""
parent
bb88fb7e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/groups/settings/ci_cd/show.html.haml
app/views/groups/settings/ci_cd/show.html.haml
+1
-1
app/views/projects/settings/ci_cd/show.html.haml
app/views/projects/settings/ci_cd/show.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+1
-1
qa/qa/page/project/settings/ci_cd.rb
qa/qa/page/project/settings/ci_cd.rb
+2
-2
No files found.
app/views/groups/settings/ci_cd/show.html.haml
View file @
7f1b7152
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
%section
.settings
#secret-variables
.no-animate
{
class:
(
'expanded'
if
expanded
)
}
%section
.settings
#secret-variables
.no-animate
{
class:
(
'expanded'
if
expanded
)
}
.settings-header
.settings-header
%h4
%h4
=
_
(
'
Secret v
ariables'
)
=
_
(
'
V
ariables'
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'ci/variables/README'
,
anchor:
'secret-variables'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'ci/variables/README'
,
anchor:
'secret-variables'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
%button
.btn.btn-default.js-settings-toggle
{
type:
"button"
}
%button
.btn.btn-default.js-settings-toggle
{
type:
"button"
}
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
...
...
app/views/projects/settings/ci_cd/show.html.haml
View file @
7f1b7152
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
%section
.settings.no-animate
{
class:
(
'expanded'
if
expanded
)
}
%section
.settings.no-animate
{
class:
(
'expanded'
if
expanded
)
}
.settings-header
.settings-header
%h4
%h4
=
_
(
'
Secret v
ariables'
)
=
_
(
'
V
ariables'
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'ci/variables/README'
,
anchor:
'secret-variables'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'ci/variables/README'
,
anchor:
'secret-variables'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.js-settings-toggle
{
type:
'button'
}
=
expanded
?
'Collapse'
:
'Expand'
=
expanded
?
'Collapse'
:
'Expand'
...
...
locale/gitlab.pot
View file @
7f1b7152
...
@@ -3517,7 +3517,7 @@ msgstr ""
...
@@ -3517,7 +3517,7 @@ msgstr ""
msgid "Seconds to wait for a storage access attempt"
msgid "Seconds to wait for a storage access attempt"
msgstr ""
msgstr ""
msgid "
Secret v
ariables"
msgid "
V
ariables"
msgstr ""
msgstr ""
msgid "Select Archive Format"
msgid "Select Archive Format"
...
...
qa/qa/page/project/settings/ci_cd.rb
View file @
7f1b7152
...
@@ -7,7 +7,7 @@ module QA # rubocop:disable Naming/FileName
...
@@ -7,7 +7,7 @@ module QA # rubocop:disable Naming/FileName
view
'app/views/projects/settings/ci_cd/show.html.haml'
do
view
'app/views/projects/settings/ci_cd/show.html.haml'
do
element
:runners_settings
,
'Runners settings'
element
:runners_settings
,
'Runners settings'
element
:secret_variables
,
'
Secret v
ariables'
element
:secret_variables
,
'
V
ariables'
end
end
def
expand_runners_settings
(
&
block
)
def
expand_runners_settings
(
&
block
)
...
@@ -17,7 +17,7 @@ module QA # rubocop:disable Naming/FileName
...
@@ -17,7 +17,7 @@ module QA # rubocop:disable Naming/FileName
end
end
def
expand_secret_variables
(
&
block
)
def
expand_secret_variables
(
&
block
)
expand_section
(
'
Secret v
ariables'
)
do
expand_section
(
'
V
ariables'
)
do
Settings
::
SecretVariables
.
perform
(
&
block
)
Settings
::
SecretVariables
.
perform
(
&
block
)
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment