1. 13 4月, 2016 3 次提交
    • P
      Project dropdown in header uses new dropdown · dca50ac1
      Phil Hughes 提交于
      dca50ac1
    • J
      Merge branch 'fix_labels_not_showing_in_todos' into 'master' · 5713c7cf
      Jacob Schatz 提交于
      Fix labels not displayed on todos page
      
      closes #14512,#13920
      
      # For Todos
      
      ## Before
      ![Screen_Shot_2016-03-23_at_8.59.32_PM](/uploads/0c22c7674783031c9be842860082fdc2/Screen_Shot_2016-03-23_at_8.59.32_PM.png)
      
      ## After
      ![Screen_Shot_2016-03-24_at_12.35.06_PM](/uploads/f62d3f39c0aa2f7079368e157a3a558c/Screen_Shot_2016-03-24_at_12.35.06_PM.png)
      
      # For Activity Feed
      
      ## Before
      ![Screen_Shot_2016-03-24_at_12.37.41_PM](/uploads/744370db7a4bd3782c029d80c3694ee7/Screen_Shot_2016-03-24_at_12.37.41_PM.png)
      
      ## After
      ![Screen_Shot_2016-03-24_at_12.37.00_PM](/uploads/9939817c14e98b50b3e16c8b7b9cf009/Screen_Shot_2016-03-24_at_12.37.00_PM.png)
      
      See merge request !3371
      5713c7cf
    • D
      Merge branch 'decouple-member-notification' into 'master' · 4516f40d
      Douwe Maan 提交于
      Decouple membership and notifications
      
      This allow you to have notification setting per project even if you are member of group. 
      It also creates background for having notification settings in project you are not member of. 
      
      
      - [x] Make it work
      - [x] Migrations
      - [x] CHANGELOG
      - [x] More tests
      - [x] API
      
      For #3359 
      
      After this merge request there is still some work to be done: 
      
      * create migration that remove duplicates in notification settings table and create uniq index (8.8 probably)
      * remove notification_level field from Member model in 9.0
      * make proper API for notification settings
      * use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) 
      * maybe more tests 
      Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
      
      See merge request !3421
      4516f40d
  2. 12 4月, 2016 37 次提交