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
c6f1ebda
Commit
c6f1ebda
authored
Aug 18, 2020
by
Fernando
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pipeline failure and minor tweaks
* Fix ruby linter failure * Fix unit test typos
parent
08e00281
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
3 deletions
+2
-3
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+0
-1
ee/app/assets/javascripts/approvals/components/security_configuration/unconfigured_security_rule.vue
...nts/security_configuration/unconfigured_security_rule.vue
+1
-1
ee/spec/frontend/approvals/components/project_settings/project_rules_spec.js
...provals/components/project_settings/project_rules_spec.js
+1
-1
No files found.
app/controllers/projects_controller.rb
View file @
c6f1ebda
...
@@ -39,7 +39,6 @@ class ProjectsController < Projects::ApplicationController
...
@@ -39,7 +39,6 @@ class ProjectsController < Projects::ApplicationController
frontend_experimentation_tracking_data
(
:new_create_project_ui
,
'click_tab'
)
frontend_experimentation_tracking_data
(
:new_create_project_ui
,
'click_tab'
)
push_frontend_feature_flag
(
:new_create_project_ui
)
if
experiment_enabled?
(
:new_create_project_ui
)
push_frontend_feature_flag
(
:new_create_project_ui
)
if
experiment_enabled?
(
:new_create_project_ui
)
push_frontend_feature_flag
(
:service_desk_custom_address
,
@project
)
push_frontend_feature_flag
(
:service_desk_custom_address
,
@project
)
end
end
before_action
only:
[
:edit
]
do
before_action
only:
[
:edit
]
do
...
...
ee/app/assets/javascripts/approvals/components/security_configuration/unconfigured_security_rule.vue
View file @
c6f1ebda
...
@@ -32,7 +32,7 @@ export default {
...
@@ -32,7 +32,7 @@ export default {
</td>
</td>
<td
class=
"gl-px-2! gl-text-right"
>
<td
class=
"gl-px-2! gl-text-right"
>
<gl-button
@
click=
"$emit('enable')"
>
<gl-button
@
click=
"$emit('enable')"
>
{{
s
__('Enable') }}
{{ __('Enable') }}
</gl-button>
</gl-button>
</td>
</td>
</template>
</template>
...
...
ee/spec/frontend/approvals/components/project_settings/project_rules_spec.js
View file @
c6f1ebda
...
@@ -152,7 +152,7 @@ describe('Approvals ProjectRules', () => {
...
@@ -152,7 +152,7 @@ describe('Approvals ProjectRules', () => {
it
(
`should
${
it
(
`should
${
approvalSuggestions
?
''
:
'
not
'
approvalSuggestions
?
''
:
'
not
'
}
render the unconfigured-security-rule component`
,
()
=>
{
}
render the unconfigured-security-rule
s
component`
,
()
=>
{
expect
(
wrapper
.
contains
(
UnconfiguredSecurityRules
)).
toBe
(
approvalSuggestions
);
expect
(
wrapper
.
contains
(
UnconfiguredSecurityRules
)).
toBe
(
approvalSuggestions
);
});
});
},
},
...
...
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