diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-26 14:27:08 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-26 14:27:08 -0500 |
| commit | 47405485f63e2341e8a317f15f2e07d289e2d703 (patch) | |
| tree | fe604225bab65375527115d10ca70f6fd69ca9ce /app/helpers | |
| parent | 9d51f86694458cfbad3d4e92da7f3797947e5f55 (diff) | |
| parent | 1922e3a8389683a01c026a06afe8e8c1539ba43a (diff) | |
| download | gitlab-ce-47405485f63e2341e8a317f15f2e07d289e2d703.tar.gz | |
Merge branch 'master' into issue_3400_port
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/events_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/preferences_helper.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index a67a6b208e2..d3e5e3aa8b9 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -194,7 +194,7 @@ module EventsHelper end def event_to_atom(xml, event) - if event.proper?(current_user) + if event.visible_to_user?(current_user) xml.entry do event_link = event_feed_url(event) event_title = event_feed_title(event) diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb index c73cb3028ee..c3832cf5d65 100644 --- a/app/helpers/preferences_helper.rb +++ b/app/helpers/preferences_helper.rb @@ -12,7 +12,9 @@ module PreferencesHelper projects: 'Your Projects (default)', stars: 'Starred Projects', project_activity: "Your Projects' Activity", - starred_project_activity: "Starred Projects' Activity" + starred_project_activity: "Starred Projects' Activity", + groups: "Your Groups", + todos: "Your Todos" }.with_indifferent_access.freeze # Returns an Array usable by a select field for more user-friendly option text |