Commit Graph

42 Commits

Author SHA1 Message Date
GitLab Bot 07fffa9f23 Add latest changes from gitlab-org/gitlab@master 2024-10-29 21:26:13 +00:00
GitLab Bot 21d9258e42 Add latest changes from gitlab-org/gitlab@master 2024-06-20 15:26:53 +00:00
GitLab Bot 6c4f8ad2d9 Add latest changes from gitlab-org/gitlab@master 2023-09-20 09:12:59 +00:00
GitLab Bot 3822e951cb Add latest changes from gitlab-org/gitlab@master 2023-09-07 09:11:12 +00:00
GitLab Bot a3a9c1103b Add latest changes from gitlab-org/gitlab@master 2023-07-26 15:08:51 +00:00
GitLab Bot 7424d727b8 Add latest changes from gitlab-org/gitlab@master 2023-06-27 18:09:04 +00:00
GitLab Bot baed745d21 Add latest changes from gitlab-org/gitlab@master 2023-02-28 15:11:48 +00:00
GitLab Bot 7eca3f5662 Add latest changes from gitlab-org/gitlab@master 2022-05-13 15:07:43 +00:00
GitLab Bot ba06d3edb0 Add latest changes from gitlab-org/gitlab@master 2022-04-07 03:08:34 +00:00
GitLab Bot a5605d87fb Add latest changes from gitlab-org/gitlab@master 2021-04-13 18:11:28 +00:00
GitLab Bot fb994e98ec Add latest changes from gitlab-org/gitlab@master 2021-02-15 18:09:09 +00:00
GitLab Bot 2ac4833015 Add latest changes from gitlab-org/gitlab@master 2020-10-08 18:08:32 +00:00
GitLab Bot 477c2c2604 Add latest changes from gitlab-org/gitlab@master 2020-09-04 09:08:38 +00:00
GitLab Bot 497b731521 Add latest changes from gitlab-org/gitlab@master 2020-09-03 03:08:12 +00:00
GitLab Bot c41b66bd05 Add latest changes from gitlab-org/gitlab@master 2020-08-28 15:10:21 +00:00
GitLab Bot cfbaef3f1c Add latest changes from gitlab-org/gitlab@master 2020-02-06 03:08:47 +00:00
GitLab Bot 9d54184f30 Add latest changes from gitlab-org/gitlab@master 2020-01-02 21:07:38 +00:00
GitLab Bot 6d59e98918 Add latest changes from gitlab-org/gitlab@master 2019-10-18 18:06:21 +00:00
antony liu f9a5056541 Externalize strings of notifications page in user profile 2019-05-28 17:01:48 +00:00
gfyoung be42c05054 Enable more frozen string in app/controllers/
Enables frozen string for the following:

* app/controllers/dashboard/**/*.rb
* app/controllers/explore/**/*.rb
* app/controllers/google_api/**/*.rb
* app/controllers/groups/**/*.rb
* app/controllers/import/**/*.rb
* app/controllers/instance_statistics/**/*.rb
* app/controllers/ldap/**/*.rb
* app/controllers/oauth/**/*.rb
* app/controllers/profiles/**/*.rb

Partially addresses #47424.
2018-09-23 12:48:02 -07:00
Yorick Peterse 2039c8280d
Disable existing offenses for the CodeReuse cops
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
James Lopez 67d06dee30 refactor users update service 2017-09-28 08:46:39 +02:00
James Lopez 9621dd0c9d refactor services to match EE signature 2017-09-28 08:46:39 +02:00
James Lopez b804db2648 refactor update user service not to do auth checks 2017-06-23 11:41:43 +02:00
James Lopez 949808529c updated emails, notifications and passwords controller 2017-06-23 11:41:41 +02:00
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