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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
e765299f
Commit
e765299f
authored
Oct 26, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correctly passes feature key into feature_available method
parent
c74ae0e4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
36 deletions
+3
-36
CHANGELOG.md
CHANGELOG.md
+1
-34
app/helpers/events_helper.rb
app/helpers/events_helper.rb
+2
-2
No files found.
CHANGELOG.md
View file @
e765299f
...
@@ -12,6 +12,7 @@ Please view this file on the master branch, on stable branches it's out of date.
...
@@ -12,6 +12,7 @@ Please view this file on the master branch, on stable branches it's out of date.
-
Fix HipChat notifications rendering (airatshigapov, eisnerd)
-
Fix HipChat notifications rendering (airatshigapov, eisnerd)
-
Refactor Jira service to use jira-ruby gem
-
Refactor Jira service to use jira-ruby gem
-
Add hover to trash icon in notes !7008 (blackst0ne)
-
Add hover to trash icon in notes !7008 (blackst0ne)
-
Hides project activity tabs when features are disabled
-
Only show one error message for an invalid email !5905 (lycoperdon)
-
Only show one error message for an invalid email !5905 (lycoperdon)
-
Fix sidekiq stats in admin area (blackst0ne)
-
Fix sidekiq stats in admin area (blackst0ne)
-
Created cycle analytics bundle JavaScript file
-
Created cycle analytics bundle JavaScript file
...
@@ -57,40 +58,6 @@ Please view this file on the master branch, on stable branches it's out of date.
...
@@ -57,40 +58,6 @@ Please view this file on the master branch, on stable branches it's out of date.
-
Fix and improve
`Sortable.highest_label_priority`
. !7165
-
Fix and improve
`Sortable.highest_label_priority`
. !7165
-
Fixed sticky merge request tabs when sidebar is pinned. !7167
-
Fixed sticky merge request tabs when sidebar is pinned. !7167
-
Only remove right connector of first build of last stage. !7179
-
Only remove right connector of first build of last stage. !7179
-
Backups do not fail anymore when using tar on annex and custom_hooks only. !5814
-
Adds user project membership expired event to clarify why user was removed (Callum Dryden)
-
Hides project activity tabs when features are disabled
-
Trim leading and trailing whitespace on project_path (Linus Thiel)
-
Prevent award emoji via notes for issues/MRs authored by user (barthc)
-
Adds an optional path parameter to the Commits API to filter commits by path (Luis HGO)
-
Fix extra space on Build sidebar on Firefox !7060
-
Fix mobile layout issues in admin user overview page !7087
-
Fix HipChat notifications rendering (airatshigapov, eisnerd)
-
Add hover to trash icon in notes !7008 (blackst0ne)
-
Fix sidekiq stats in admin area (blackst0ne)
-
Removed delete branch tooltip !6954
-
Escape ref and path for relative links !6050 (winniehell)
-
Fixed link typo on /help/ui to Alerts section. !6915 (Sam Rose)
-
Fix filtering of milestones with quotes in title (airatshigapov)
-
Refactor less readable existance checking code from CoffeeScript !6289 (jlogandavison)
-
Update mail_room and enable sentinel support to Reply By Email (!7101)
-
Simpler arguments passed to named_route on toggle_award_url helper method
-
Fix typo in framework css class. !7086 (Daniel Voogsgerd)
-
New issue board list dropdown stays open after adding a new list
-
Fix: Backup restore doesn't clear cache
-
API: Fix project deploy keys 400 and 500 errors when adding an existing key. !6784 (Joshua Welsh)
-
Replace jquery.cookie plugin with js.cookie !7085
-
Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method
-
Fix Sign in page 'Forgot your password?' link overlaps on medium-large screens
-
Show full status link on MR & commit pipelines
-
Fix documents and comments on Build API
`scope`
-
Fix applying labels for GitHub-imported MRs
-
Fix importing MR comments from GitHub
-
Refactor email, use setter method instead AR callbacks for email attribute (Semyon Pupkov)
-
Shortened merge request modal to let clipboard button not overlap
## 8.13.2
-
Fix builds dropdown overlapping bug !7124
## 8.13.1 (2016-10-25)
## 8.13.1 (2016-10-25)
...
...
app/helpers/events_helper.rb
View file @
e765299f
...
@@ -39,10 +39,10 @@ module EventsHelper
...
@@ -39,10 +39,10 @@ module EventsHelper
end
end
end
end
def
event_filter_visible
(
key
)
def
event_filter_visible
(
feature_
key
)
return
true
unless
@project
return
true
unless
@project
@project
.
feature_available?
(
:repositor
y
,
current_user
)
@project
.
feature_available?
(
feature_ke
y
,
current_user
)
end
end
def
event_preposition
(
event
)
def
event_preposition
(
event
)
...
...
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