root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
111,883 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

54 Commits

Author SHA1 Message Date
GitLab Bot 86a3b1b3ae Add latest changes from gitlab-org/gitlab@master 2023-12-12 15:13:14 +00:00
GitLab Bot 320d8adff1 Add latest changes from gitlab-org/gitlab@master 2023-09-11 12:10:57 +00:00
GitLab Bot 3ed578edf5 Add latest changes from gitlab-org/gitlab@master 2022-11-14 09:08:04 +00:00
GitLab Bot b487021bd3 Add latest changes from gitlab-org/gitlab@master 2021-08-17 12:08:42 +00:00
GitLab Bot 0ae8428c8e Add latest changes from gitlab-org/gitlab@master 2021-05-11 21:10:21 +00:00
GitLab Bot 93f77228e3 Add latest changes from gitlab-org/gitlab@master 2021-04-20 06:09:33 +00:00
GitLab Bot a5605d87fb Add latest changes from gitlab-org/gitlab@master 2021-04-13 18:11:28 +00:00
GitLab Bot 1fdc1d34e8 Add latest changes from gitlab-org/gitlab@master 2021-02-19 12:11:06 +00:00
GitLab Bot 21e08b6197 Add latest changes from gitlab-org/gitlab@master 2020-12-02 12:09:46 +00:00
GitLab Bot 7985071975 Add latest changes from gitlab-org/gitlab@master 2020-09-21 12:09:34 +00:00
GitLab Bot 4203215d54 Add latest changes from gitlab-org/gitlab@master 2020-08-17 12:10:12 +00:00
GitLab Bot 3e71ce5cf0 Add latest changes from gitlab-org/gitlab@master 2020-07-28 03:09:35 +00:00
GitLab Bot 47579e24f3 Add latest changes from gitlab-org/gitlab@master 2020-05-27 21:08:05 +00:00
GitLab Bot e0fa0638a4 Add latest changes from gitlab-org/gitlab@master 2020-02-27 18:09:21 +00:00
GitLab Bot cfbaef3f1c Add latest changes from gitlab-org/gitlab@master 2020-02-06 03:08:47 +00:00
GitLab Bot 6b9d3a4e83 Add latest changes from gitlab-org/gitlab@master 2020-01-29 18:08:47 +00:00
GitLab Bot 6d59e98918 Add latest changes from gitlab-org/gitlab@master 2019-10-18 18:06:21 +00:00
GitLab Bot 184c2ced07 Add latest changes from gitlab-org/gitlab@master 2019-10-17 18:08:05 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Dmitriy Zaporozhets 00e19736f9
Remove ignore_column occurence in CE code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2019-09-10 17:54:43 +02:00
Stan Hu d93b985df0 Use self.ignored_columns += instead of = 
This is to accomodate prepended modules.
 2019-08-30 13:15:34 -07:00
dineshpanda fa6f19d1f8 Remove dependency on IgnorableColumn concern 2019-08-30 02:09:13 +05:30
Heinrich Lee Yu a1684d1440 Simplify notification check for participating 2019-06-06 01:34:25 +08:00
Nick Thomas 013f7cd24c
Inherit from ApplicationRecord instead of ActiveRecord::Base 2019-03-28 16:18:23 +00:00
C.J. Jameson 8f83445a8b reorder notification settings by noisy-ness 
fixes !54609
 2018-11-30 18:16:03 -08:00
Mark Chao f8ee861cd4 Move N_ calls into separate files 
These are dynamic translations, so has to be marked explicitly using `N_`,
but they are not used in runtime, so can exist in separate file.
https://github.com/grosser/gettext_i18n_rails#unfound-translations-with-rake-gettextfind
 2018-08-14 17:30:51 +08:00
Mark Chao 8411d1cffc Add email_events to replace EMAIL_EVENTS because it needs to be dynamic, 
allowing override for EE.
 2018-08-14 14:59:29 +08:00
gfyoung 50abbd3e53 Enable frozen string in app/models/*.rb 
Partially addresses #47424.
 2018-07-26 16:55:41 -07:00
Felipe Artur ef12973723 Allow to toggle notifications for issues due soon 2018-07-12 12:03:29 -03:00
Sean McGivern 5ab75649f3 Only send issue due emails to participants and custom subscribers 2018-03-30 13:25:46 +01:00
YarNayar 99b01e2359 Send notification emails when push to a merge request 
Closes #23460
 2018-03-26 13:24:52 +01:00
Brian Neel 9770c57fab Re-enable SqlInjection and CommandInjection 2017-08-08 10:50:54 -04:00
Sean McGivern 57a5544f88 Remove events column from notification settings 
This was migrated to separate columns in 9.4, and now just needs to be removed
for real.
 2017-07-31 11:18:55 +01:00
Tiago Botelho 34f57b462b Fix current feature related specs 2017-06-28 11:32:34 +01:00
Sean McGivern e94c1028c1 Deserialise existing custom notification settings 
Create a post-deployment migration to update all existing notification settings
with at least one custom level enabled to the new format. Also handle the same
conversion when updating settings, to catch any stragglers.
 2017-06-15 15:15:13 +01:00
Sean McGivern f4b5fcbca1 Add columns for custom notification settings 
Add columns for each custom notification level, defaulting to null. Read from
those columns if non-null, otherwise fall back to the serialized column. Writing
will write to the new column if `events` isn't manually set.
 2017-06-15 15:14:45 +01:00
Yorick Peterse 5819ca1a24
Added Cop to blacklist polymorphic associations 
One should really use a separate table instead of using polymorphic
associations.

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11168 for
more information.
 2017-06-07 17:36:55 +02:00
Sean McGivern a1805cbcd5 Quiet pipeline emails 
1. Never send a pipeline email to anyone other than the user who created
   the pipeline.
2. Only send pipeline success emails to people with the custom
   notification setting for enabled. Watchers and participants will
   never receive this.
3. When custom settings are unset (for new settings and legacy ones),
   act as if failed_pipeline is set.
 2017-04-03 13:59:48 +01:00
Douwe Maan b7d8df503c Enable Style/MutableConstant 2017-02-23 09:31:56 -06:00
Lin Jen-Shin ce7c632f50 Introduce EXCLUDED_WATCHER_EVENTS to exclude events 
for watchers. Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8176#note_20920905
 2017-01-05 19:53:56 +08:00
Lin Jen-Shin 8ea702cfe5 Revert "Split notification integration into another branch" 
This reverts commit 1404aa8677.
 2016-10-17 07:24:48 +00:00
Lin Jen-Shin 1404aa8677 Split notification integration into another branch 2016-09-14 19:34:24 +08:00
Lin Jen-Shin 4add6ca6ec Try to integrate the email into notification system 2016-09-13 19:09:53 +08:00
Sean McGivern ea25e0918b Exclude projects pending delete from notifications 
If the Sidekiq job fails for some reason, a project can be 'stuck'
pending deletion. The project can't be viewed, so it shouldn't be
available through the notification settings association as this will
throw an exception when we try to show the link.
 2016-07-07 20:49:17 +01:00
Felipe Artur 89a2c8730b Implement custom notification level options 2016-06-15 11:47:50 -03:00
Felipe Artur 8f6d43e0fe Remove notification level from user model 2016-06-10 10:58:13 -03:00
Phil Hughes e141a1c6f1 Notifications dropdown on project page now has descriptions 
This is part of #12758
 2016-06-07 15:02:00 +01:00
Jeroen van Baarsen f1479b56b7
Remove the annotate gem and delete old annotations 
In 8278b763d9 the default behaviour of annotation
has changes, which was causing a lot of noise in diffs. We decided in #17382
that it is better to get rid of the whole annotate gem, and instead let people
look at schema.rb for the columns in a table.

Fixes: #17382
 2016-05-09 18:00:28 +02:00
Zeger-Jan van de Weg 47da013cf8 Annotate the models 2016-05-06 08:27:46 +02:00
Douglas Barbosa Alexandre 73fdd4b83d Use Hash instead of Array on NotificationSetting#level enum 2016-04-11 10:23:40 -03:00