Merge branch 'master' into developer_can_push_to_protected_branches_option

CHANGELOG

@@ -4,7 +4,7 @@ v 7.7.0
   - Add Jetbrains Teamcity CI service (Jason Lippert)
   -
   -
-  -
+  - Mention notification level
   -
   -
   - OAuth applications feature
@@ -14,8 +14,12 @@ v 7.7.0
   -
   -
   - New side navigation
-  
-
+  -
+  -
+  -
+  - Add alert message in case of outdated browser (IE < 10)
+  -
+  -
 
 v 7.6.0
   - Fork repository to groups

Gemfile

@@ -32,6 +32,9 @@ gem 'omniauth-kerberos'
 gem 'doorkeeper', '2.0.1'
 gem "rack-oauth2", "~> 1.0.5"
 
+# Browser detection
+gem "browser"
+
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
 gem "gitlab_git", '7.0.0.rc12'

Gemfile.lock

@@ -50,6 +50,7 @@ GEM
       debug_inspector (>= 0.0.1)
     bootstrap-sass (3.0.3.0)
       sass (~> 3.2)
+    browser (0.7.2)
     builder (3.2.2)
     capybara (2.2.1)
       mime-types (>= 1.16)
@@ -614,6 +615,7 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bootstrap-sass (~> 3.0)
+  browser
   capybara (~> 2.2.1)
   carrierwave
   coffee-rails

VERSION

-7.6.0.pre
+7.7.0.pre

app/assets/stylesheets/generic/common.scss

@@ -207,6 +207,18 @@ li.note {
   }
 }
 
+.browser-alert {
+  padding: 10px;
+  text-align: center;
+  background: #C67;
+  color: #fff;
+  font-weight: bold;
+  a {
+    color: #fff;
+    text-decoration: underline;
+  }
+}
+
 .warning_message {
   border-left: 4px solid #ed9;
   color: #b90;

app/helpers/application_helper.rb

@@ -293,4 +293,8 @@ module ApplicationHelper
     path << "?#{options.to_param}"
     path
   end
+
+  def outdated_browser?
+    browser.ie? && browser.version.to_i < 10
+  end
 end

app/models/notification.rb

@@ -6,12 +6,13 @@ class Notification
   N_PARTICIPATING = 1
   N_WATCH = 2
   N_GLOBAL = 3
+  N_MENTION = 4
 
   attr_accessor :target
 
   class << self
     def notification_levels
-      [N_DISABLED, N_PARTICIPATING, N_WATCH]
+      [N_DISABLED, N_PARTICIPATING, N_WATCH, N_MENTION]
     end
 
     def options_with_labels
@@ -19,12 +20,13 @@ class Notification
         disabled: N_DISABLED,
         participating: N_PARTICIPATING,
         watch: N_WATCH,
+        mention: N_MENTION,
         global: N_GLOBAL
       }
     end
 
     def project_notification_levels
-      [N_DISABLED, N_PARTICIPATING, N_WATCH, N_GLOBAL]
+      [N_DISABLED, N_PARTICIPATING, N_WATCH, N_GLOBAL, N_MENTION]
     end
   end
 
@@ -48,6 +50,10 @@ class Notification
     target.notification_level == N_GLOBAL
   end
 
+  def mention?
+    target.notification_level == N_MENTION
+  end
+
   def level
     target.notification_level
   end

app/services/notification_service.rb

@@ -144,6 +144,10 @@ class NotificationService
     # Merge project watchers
     recipients = recipients.concat(project_watchers(note.project)).compact.uniq
 
+    # Reject mention users unless mentioned in comment
+    recipients = reject_mention_users(recipients - note.mentioned_users, note.project)
+    recipients = recipients + note.mentioned_users
+
     # Reject mutes users
     recipients = reject_muted_users(recipients, note.project)
 
@@ -285,13 +289,39 @@ class NotificationService
     end
   end
 
+  # Remove users with notification level 'Mentioned'
+  def reject_mention_users(users, project = nil)
+    users = users.to_a.compact.uniq
+
+    users.reject do |user|
+      next user.notification.mention? unless project
+
+      tm = project.project_members.find_by(user_id: user.id)
+
+      if !tm && project.group
+        tm = project.group.group_members.find_by(user_id: user.id)
+      end
+
+      # reject users who globally set mention notification and has no membership
+      next user.notification.mention? unless tm
+
+      # reject users who set mention notification in project
+      next true if tm.notification.mention?
+
+      # reject users who have N_MENTION in project and disabled in global settings
+      tm.notification.global? && user.notification.mention?
+    end
+  end
+
   def new_resource_email(target, project, method)
     if target.respond_to?(:participants)
       recipients = target.participants
     else
       recipients = []
     end
+
     recipients = reject_muted_users(recipients, project)
+    recipients = reject_mention_users(recipients, project)
     recipients = recipients.concat(project_watchers(project)).uniq
     recipients.delete(target.author)
 
@@ -302,6 +332,7 @@ class NotificationService
 
   def close_resource_email(target, project, current_user, method)
     recipients = reject_muted_users([target.author, target.assignee], project)
+    recipients = reject_mention_users(recipients, project)
     recipients = recipients.concat(project_watchers(project)).uniq
     recipients.delete(current_user)
 
@@ -320,6 +351,7 @@ class NotificationService
 
     # reject users with disabled notifications
     recipients = reject_muted_users(recipients, project)
+    recipients = reject_mention_users(recipients, project)
 
     # Reject me from recipients if I reassign an item
     recipients.delete(current_user)
@@ -331,6 +363,7 @@ class NotificationService
 
   def reopen_resource_email(target, project, current_user, method, status)
     recipients = reject_muted_users([target.author, target.assignee], project)
+    recipients = reject_mention_users(recipients, project)
     recipients = recipients.concat(project_watchers(project)).uniq
     recipients.delete(current_user)
 

app/views/groups/_settings_nav.html.haml

@@ -2,9 +2,10 @@
   = nav_link(path: 'groups#edit') do
     = link_to edit_group_path(@group) do
       %i.fa.fa-pencil-square-o
+      %span
         Group
   = nav_link(path: 'groups#projects') do
     = link_to projects_group_path(@group) do
       %i.fa.fa-folder
+      %span
         Projects
-

app/views/layouts/_head_panel.html.haml

@@ -44,3 +44,5 @@
           %li.hidden-xs
             = link_to current_user, class: "profile-pic", id: 'profile-pic' do
               = image_tag avatar_icon(current_user.email, 26), alt: 'User activity'
+
+= render 'shared/outdated_browser'

app/views/layouts/_public_head_panel.html.haml

@@ -20,3 +20,4 @@
           %li.visible-xs
             = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes')
 
+= render 'shared/outdated_browser'

app/views/layouts/devise.html.haml

@@ -6,6 +6,7 @@
       .content
         .login-title
           %h1= brand_title
+    = render 'shared/outdated_browser'
     %hr
     .container
       .content

app/views/layouts/nav/_profile.html.haml

@@ -7,6 +7,7 @@
   = nav_link(controller: :accounts) do
     = link_to profile_account_path do
       %i.fa.fa-gear
+      %span
         Account
   = nav_link(path: ['profiles#applications', 'applications#edit', 'applications#show', 'applications#new']) do
     = link_to applications_profile_path do

app/views/profiles/notifications/show.html.haml

@@ -15,6 +15,13 @@
           Disabled
         %p You will not get any notifications via email
 
+    .radio
+      = label_tag nil, class: '' do
+        = radio_button_tag :notification_level, Notification::N_MENTION, @notification.mention?, class: 'trigger-submit'
+        .level-title
+          Mention
+        %p You will receive notifications only for comments where you was @mentioned
+
     .radio
       = label_tag nil, class: '' do
         = radio_button_tag :notification_level, Notification::N_PARTICIPATING, @notification.participating?, class: 'trigger-submit'

app/views/projects/commits/show.html.haml

@@ -11,8 +11,6 @@
 
 %ul.breadcrumb.repo-breadcrumb
   = commits_breadcrumbs
-  %li.active
-    commits
 
 %div{id: dom_id(@project)}
   #commits-list= render "commits"

app/views/shared/_outdated_browser.html.haml

+- if outdated_browser?
+  - link = "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/requirements.md#supported-web-browsers"
+  .browser-alert
+    GitLab may not work properly because you are using an outdated web browser.
+    %br
+    Please install a
+    = link_to 'supported web browser', link
+    for a better experience.

doc/permissions/permissions.md

@@ -8,7 +8,6 @@ If a user is a GitLab administrator they receive all permissions.
 
 ## Project
 
-
 | Action                                | Guest   | Reporter   | Developer   | Master   | Owner  |
 |---------------------------------------|---------|------------|-------------|----------|--------|
 | Create new issue                      | ✓       | ✓          | ✓           | ✓        | ✓      |

features/steps/project/merge_requests.rb

@@ -265,7 +265,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I click Side-by-side Diff tab' do
-    click_link 'Side-by-side'
+    find('a', text: 'Side-by-side').trigger('click')
   end
 
   step 'I should see comments on the side-by-side diff page' do

spec/services/notification_service_spec.rb

@@ -116,6 +116,7 @@ describe NotificationService do
           should_email(note.noteable.assignee_id)
 
           should_not_email(note.author_id)
+          should_not_email(@u_mentioned.id)
           should_not_email(@u_disabled.id)
           should_not_email(@u_not_mentioned.id)
           notification.new_note(note)
@@ -168,6 +169,12 @@ describe NotificationService do
           notification.new_note(note)
         end
 
+        it do
+          @u_committer.update_attributes(notification_level: Notification::N_MENTION)
+          should_not_email(@u_committer.id, note)
+          notification.new_note(note)
+        end
+
         def should_email(user_id, n)
           Notify.should_receive(:note_commit_email).with(user_id, n.id)
         end
@@ -190,11 +197,18 @@ describe NotificationService do
       it do
         should_email(issue.assignee_id)
         should_email(@u_watcher.id)
+        should_not_email(@u_mentioned.id)
         should_not_email(@u_participating.id)
         should_not_email(@u_disabled.id)
         notification.new_issue(issue, @u_disabled)
       end
 
+      it do
+        issue.assignee.update_attributes(notification_level: Notification::N_MENTION)
+        should_not_email(issue.assignee_id)
+        notification.new_issue(issue, @u_disabled)
+      end
+
       def should_email(user_id)
         Notify.should_receive(:new_issue_email).with(user_id, issue.id)
       end
@@ -391,7 +405,7 @@ describe NotificationService do
     @u_watcher = create(:user, notification_level: Notification::N_WATCH)
     @u_participating = create(:user, notification_level: Notification::N_PARTICIPATING)
     @u_disabled = create(:user, notification_level: Notification::N_DISABLED)
-    @u_mentioned = create(:user, username: 'mention', notification_level: Notification::N_PARTICIPATING)
+    @u_mentioned = create(:user, username: 'mention', notification_level: Notification::N_MENTION)
     @u_committer = create(:user, username: 'committer')
     @u_not_mentioned = create(:user, username: 'regular', notification_level: Notification::N_PARTICIPATING)