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
ff44e0e9
Commit
ff44e0e9
authored
Oct 02, 2018
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix all code offences
parent
bddd1961
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
7 deletions
+8
-7
ee/app/helpers/ee/projects_helper.rb
ee/app/helpers/ee/projects_helper.rb
+1
-1
ee/app/views/projects/feature_flags/new.html.haml
ee/app/views/projects/feature_flags/new.html.haml
+1
-0
ee/spec/controllers/projects/feature_flags_controller_spec.rb
...pec/controllers/projects/feature_flags_controller_spec.rb
+1
-2
ee/spec/features/projects/feature_flags_spec.rb
ee/spec/features/projects/feature_flags_spec.rb
+3
-2
ee/spec/lib/gitlab/import_export/all_models.yml
ee/spec/lib/gitlab/import_export/all_models.yml
+1
-1
ee/spec/requests/api/unleash_spec.rb
ee/spec/requests/api/unleash_spec.rb
+1
-1
No files found.
ee/app/helpers/ee/projects_helper.rb
View file @
ff44e0e9
...
...
@@ -31,7 +31,7 @@ module EE
nav_tabs
end
override
:tab_ability_map
def
tab_ability_map
tab_ability_map
=
super
...
...
ee/app/views/projects/feature_flags/new.html.haml
View file @
ff44e0e9
-
@breadcrumb_link
=
new_project_feature_flag_path
(
@project
)
-
add_to_breadcrumbs
"Feature Flags"
,
project_feature_flags_path
(
@project
)
-
breadcrumb_title
s_
(
'FeatureFlags|New'
)
-
page_title
s_
(
'FeatureFlags|New Feature Flag'
)
...
...
ee/spec/controllers/projects/feature_flags_controller_spec.rb
View file @
ff44e0e9
...
...
@@ -67,7 +67,7 @@ describe Projects::FeatureFlagsController do
it
'renders the form'
do
subject
expect
(
response
).
to
be_ok
expect
(
response
).
to
render_template
(
'new'
)
expect
(
response
).
to
render_template
(
'_form'
)
...
...
@@ -151,4 +151,3 @@ describe Projects::FeatureFlagsController do
{
namespace_id:
project
.
namespace
,
project_id:
project
}
end
end
ee/spec/features/projects/feature_flags_spec.rb
View file @
ff44e0e9
...
...
@@ -14,6 +14,7 @@ describe 'Feature Flags', :js do
let
(
:project
)
{
create
(
:project
,
namespace:
user
.
namespace
)}
before
do
stub_licensed_features
(
feature_flags:
true
)
sign_in
(
user
)
end
...
...
@@ -47,7 +48,7 @@ describe 'Feature Flags', :js do
it
'displays an error message'
do
add_feature_flag
(
name
,
description
,
false
)
expect
(
current_path
).
to
eq
project_feature_flag
s
_path
(
project
)
expect
(
current_path
).
to
eq
project_feature_flag_path
(
project
)
expect
(
page
).
to
have_selector
'.alert-danger'
,
text:
error_message
end
end
...
...
@@ -78,7 +79,7 @@ describe 'Feature Flags', :js do
it
'displays an error message'
do
edit_feature_flag
(
'feature-flag-to-edit'
,
name
,
description
,
false
)
expect
(
current_path
).
to
eq
project_feature_flag
s
_path
(
project
)
expect
(
current_path
).
to
eq
project_feature_flag_path
(
project
)
expect
(
page
).
to
have_selector
'.alert-danger'
,
text:
error_message
end
end
...
...
ee/spec/lib/gitlab/import_export/all_models.yml
View file @
ff44e0e9
...
...
@@ -57,7 +57,7 @@ project:
-
vulnerability_identifiers
-
vulnerability_scanners
-
operations_feature_flags
-
operations_feature_flags_
instance
-
operations_feature_flags_
client
-
prometheus_alerts
-
prometheus_alert_events
-
software_license_policies
...
...
ee/spec/requests/api/unleash_spec.rb
View file @
ff44e0e9
...
...
@@ -88,7 +88,7 @@ describe API::Unleash do
it
'matches json schema'
do
subject
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'unleash/unleash'
,
dir:
'ee'
)
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