BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f8f68d6b
Commit
f8f68d6b
authored
Mar 29, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix few bugs related to recent notifications refactoring
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
71e7b398
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
notifications_controller.rb
app/controllers/profiles/notifications_controller.rb
+0
-1
member.rb
app/models/member.rb
+1
-1
No files found.
app/controllers/profiles/notifications_controller.rb
View file @
f8f68d6b
class
Profiles
::
NotificationsController
<
Profiles
::
ApplicationController
def
show
@user
=
current_user
@notification
=
current_user
.
notification
@group_notifications
=
current_user
.
notification_settings
.
for_groups
@project_notifications
=
current_user
.
notification_settings
.
for_projects
end
...
...
app/models/member.rb
View file @
f8f68d6b
...
...
@@ -163,7 +163,7 @@ class Member < ActiveRecord::Base
end
def
create_notification_setting
user
.
notification_setting
.
find_or_create_for
(
source
)
user
.
notification_setting
s
.
find_or_create_for
(
source
)
end
def
notification_setting
...
...
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