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
5d51ab2a
Commit
5d51ab2a
authored
Aug 23, 2017
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Linting Errors
parent
acfd70f0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
5 deletions
+3
-5
app/controllers/groups/analytics_controller.rb
app/controllers/groups/analytics_controller.rb
+1
-1
app/controllers/projects/audit_events_controller.rb
app/controllers/projects/audit_events_controller.rb
+2
-2
spec/controllers/groups/analytics_controller_spec.rb
spec/controllers/groups/analytics_controller_spec.rb
+0
-1
spec/features/projects/audit_events_spec.rb
spec/features/projects/audit_events_spec.rb
+0
-1
No files found.
app/controllers/groups/analytics_controller.rb
View file @
5d51ab2a
...
...
@@ -34,6 +34,6 @@ class Groups::AnalyticsController < Groups::ApplicationController
end
def
check_contribution_analytics_available!
render_404
unless
(
@group
.
feature_available?
(
:contribution_analytics
)
||
LicenseHelper
.
show_promotions?
(
current_user
)
)
render_404
unless
@group
.
feature_available?
(
:contribution_analytics
)
||
LicenseHelper
.
show_promotions?
(
current_user
)
end
end
app/controllers/projects/audit_events_controller.rb
View file @
5d51ab2a
class
Projects::AuditEventsController
<
Projects
::
ApplicationController
include
LicenseHelper
before_action
:authorize_admin_project!
before_action
:check_audit_events_available!
...
...
@@ -11,6 +11,6 @@ class Projects::AuditEventsController < Projects::ApplicationController
end
def
check_audit_events_available!
render_404
unless
(
@project
.
feature_available?
(
:audit_events
)
||
LicenseHelper
.
show_promotions?
(
current_user
)
)
render_404
unless
@project
.
feature_available?
(
:audit_events
)
||
LicenseHelper
.
show_promotions?
(
current_user
)
end
end
spec/controllers/groups/analytics_controller_spec.rb
View file @
5d51ab2a
...
...
@@ -55,7 +55,6 @@ describe Groups::AnalyticsController do
expect
(
response
).
to
have_http_status
(
200
)
end
it
'sets instance variables properly'
do
get
:show
,
group_id:
group
.
path
...
...
spec/features/projects/audit_events_spec.rb
View file @
5d51ab2a
...
...
@@ -47,7 +47,6 @@ feature 'Projects > Audit Events', :js do
end
end
it
'has Audit Events button in head nav bar'
do
visit
edit_project_path
(
project
)
...
...
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