Commit graph

17 commits

Author SHA1 Message Date
Stan Hu
7cad597f6c Revert "Merge branch '8836-mr-revert' into 'master'
This reverts commit 68e40bd49f, reversing
changes made to 2d1f823b4c.
2017-03-16 20:18:57 -07:00
Stan Hu
203bb0bc54 Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'
This reverts commit 5e96668803, reversing
changes made to b35378a938.
2017-03-15 11:51:08 -07:00
Richard Macklin
0a0207ea91 Add notified_of_own_activity to permitted attributes
in Profiles::NotificationsController#update
2017-02-01 11:31:21 -08:00
Felipe Artur
f82ab42d05 Re-use notifications dropdown on user profile 2016-06-16 23:34:21 -03:00
Felipe Artur
39ead205de Remove notification level fild from users, improve migrations and specs 2016-06-10 11:49:30 -03:00
Felipe Artur
8f6d43e0fe Remove notification level from user model 2016-06-10 10:58:13 -03:00
Dmitriy Zaporozhets
26631f9981 Change how notification settings in profile are rendered and updated
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets
f8f68d6b8c Fix few bugs related to recent notifications refactoring
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets
359157c097 Introduce NotificationSetting to user interface
* visiting project will create notification setting if missing
* change notification setting per project even without membership
* use notification settings instead of membership on profile page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Stan Hu
9bfc531ec6 Redirect to a default path if HTTP_REFERER is not set
Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode,
and it's possible load balancers/proxies strip the HTTP_REFERER from
the request header. In these cases, default to some default path.

Closes #3122

Closes https://github.com/gitlabhq/gitlabhq/issues/9731
2015-10-20 07:45:48 -07:00
Douwe Maan
26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Douwe Maan
99f995755e Use group_member instead of users_group or membership. 2015-03-15 13:49:41 +01:00
Douwe Maan
9dbd7e5aec Allow notification email to be set separately from primary email.
Closes #1932.
2015-02-07 23:19:17 +01:00
Dmitriy Zaporozhets
bdbadebe3e
Fix adminarea and emails for new membership logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15 10:57:02 +03:00
Dmitriy Zaporozhets
8210d81381
Replace old references of users_project & users_group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:51:54 +03:00
Dmitriy Zaporozhets
c69b8e0459
Huge replace of old users_project and users_group references
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:32:51 +03:00
Dmitriy Zaporozhets
3e09e6f7b8 Move Profile related controllers under Profiles:: module 2013-06-24 18:24:14 +03:00
Renamed from app/controllers/notifications_controller.rb (Browse further)