Commits · 3023cf74de09dcb4ac3edb1009564379cb3ce446 · nexedi / gitlab-ce · GitLab

03 Aug, 2017 37 commits
- short-circuit if there is no policy, and add :read_project check · 3023cf74
  http://jneen.net/ authored Aug 01, 2017
  
  3023cf74
- force queries to include notification settings · 7f1fbc93
  http://jneen.net/ authored Jul 31, 2017
  
  7f1fbc93
- use a simple pluck, since equivalent filtering happens later · 2b02158c
  http://jneen.net/ authored Jul 31, 2017
  
  2b02158c
- style fixes · e4d10b80
  http://jneen.net/ authored Jul 31, 2017
  
  e4d10b80
- don't require project · 5905b756
  http://jneen.net/ authored Jul 31, 2017
```
it's not there in the case of personal snippets, f. ex., and we've
already guarded against its being missing in #find_notification_setting
```
  5905b756
- .notifiable_users: compact the passed-in users · 52793a4a
  http://jneen.net/ authored Aug 01, 2017
  
  52793a4a
- default the project to target.project · 1b66c285
  http://jneen.net/ authored Jul 31, 2017
  
  1b66c285
- require that the user be able to :read_build · 0c112315
  http://jneen.net/ authored Jul 28, 2017
```
to get a pipeline_failed email
```
  0c112315
- make sure users have to be able to read_pipeline · ca119eb9
  http://jneen.net/ authored Jul 26, 2017
```
to get pipeline failed notifications
```
  ca119eb9
- use intersection and diff operators instead of each · 21675794
  http://jneen.net/ authored Jul 26, 2017
  
  21675794
- make sure #custom_action is always defined · 9837256f
  http://jneen.net/ authored Jul 26, 2017
  
  9837256f
- move Recipient to its own NotificationRecipient file · 04fc23d6
  http://jneen.net/ authored Jul 26, 2017
  
  04fc23d6
- move the #build_* methods to static, parameterize the project · 394e86f6
  http://jneen.net/ authored Jul 26, 2017
  
  394e86f6
- rm a now-useless spec · 3744ef52
  http://jneen.net/ authored Jul 26, 2017
  
  3744ef52
- factor out .notifiable_users · 17150a69
  http://jneen.net/ authored Jul 26, 2017
  
  17150a69
- don't elevate to :watch if no @custom_action is provided · e661475d
  http://jneen.net/ authored Jul 25, 2017
  
  e661475d
- rm the @builder argument and factor out .notifiable_users · 498c3332
  http://jneen.net/ authored Jul 25, 2017
  
  498c3332
- move filtering logic into Recipient class · 09c3eb43
  http://jneen.net/ authored Aug 01, 2017
  
  09c3eb43
- add builder helpers with levels and start to separate out #filter! · a09d218f
  http://jneen.net/ authored Aug 01, 2017
  
  a09d218f
- make recipients mutative during the build · f7e059af
  http://jneen.net/ authored Jul 20, 2017
  
  f7e059af
- move build_custom_key to Default · f793d37d
  http://jneen.net/ authored Jul 20, 2017
  
  f793d37d
- factor out the `target` argument to helpers · ee920fa1
  http://jneen.net/ authored Jul 20, 2017
  
  ee920fa1
- move the build arguments to the initializers · 742d3eea
  http://jneen.net/ authored Jul 20, 2017
  
  742d3eea
- move the builders to classes with a #build · 2892969a
  http://jneen.net/ authored Jul 20, 2017
  
  2892969a
- use notification_setting_for_user_project in reject_users · b8ab6f2f
  http://jneen.net/ authored Jul 20, 2017
  
  b8ab6f2f
- protect against nil project/group/setting · 9acf95b0
  http://jneen.net/ authored Jul 20, 2017
  
  9acf95b0
- move notification_setting_for_user_project to a public class method · e33f9a2d
  http://jneen.net/ authored Jul 20, 2017
  
  e33f9a2d
- move the ability check to reject_users_without_access · b3b67751
  http://jneen.net/ authored Jul 19, 2017
  
  b3b67751
- Merge branch 'ce-to-ee-2017-07-28' into 'master' · 29fe5d4d
  Rémy Coutable authored Aug 03, 2017
```
CE upstream - Friday

Closes gitaly#408, gitaly#411, and #1827

See merge request !2554
```
  29fe5d4d
- Remove :empty_project factory from spec/requests/api/merge_requests_spec.rb · 2ede81d2
  Nick Thomas authored Aug 03, 2017
  
  2ede81d2
- Merge branch 'ee-sidebar-fly-out-sub-nav' into 'master' · 51fe933c
  Filipa Lacerda authored Aug 03, 2017
```
EE port of sidebar-fly-out-sub-nav

See merge request !2576
```
  51fe933c
- Fix merge conflicts · d90f9c52
  Nick Thomas authored Aug 03, 2017
  
  d90f9c52
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-07-28 · 811c0255
  Nick Thomas authored Aug 03, 2017
  
  811c0255
- Try to fix some EE protected branches specs · 745db030
  Nick Thomas authored Aug 03, 2017
  
  745db030
- Merge branch 'sh-add-cursor-update-logging' into 'master' · e09a5a90
  Rémy Coutable authored Aug 03, 2017
```
Add structured log messages to Geo LogCursor

See merge request !2574
```
  e09a5a90
- Merge branch 'rs-empty_project-default-ee' into 'master' · cf27ede3
  Rémy Coutable authored Aug 03, 2017
```
[EE] Empty project factory by default

See merge request !2585
```
  cf27ede3
- Remove EE-specific usages of `:empty_project` · f81df0d4
  Robert Speicher authored Aug 02, 2017
  
  f81df0d4
02 Aug, 2017 3 commits
- Change all `:empty_project` to `:project` · 17f36d4b
  Robert Speicher authored Aug 02, 2017
  
  17f36d4b
- Remove `:empty_project` factory, implement `:repository` trait · 037a62f3
  Robert Speicher authored Aug 02, 2017
  
  037a62f3
- Remove documentation about `:empty_project` since we're removing it · 89c73add
  Robert Speicher authored Aug 02, 2017
  
  89c73add