Merge branch 'master' into mwessel/gitlab-ce-configure-protection

3 files changed, 9 insertions, 8 deletions

diff --git a/app/services/oauth2/access_token_validation_service.rb b/app/services/oauth2/access_token_validation_service.rb
index 5a3b94129f1..6194f6ce91e 100644
--- a/app/services/oauth2/access_token_validation_service.rb
+++ b/app/services/oauth2/access_token_validation_service.rb
@@ -38,4 +38,4 @@ module Oauth2::AccessTokenValidationService
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/services/projects/image_service.rb b/app/services/projects/image_service.rb
index c79ddddd972..7ca7e82c4a3 100644
--- a/app/services/projects/image_service.rb
+++ b/app/services/projects/image_service.rb
@@ -14,14 +14,14 @@ module Projects
         uploader.store!(image)
         link = {
                  'alt' => File.basename(alt, '.*'),
-                 'url' => File.join(@root_url, uploader.url) 
+                 'url' => File.join(@root_url, uploader.url)
                }
       else
         link = nil
       end
     end
 
-  protected
+    protected
 
     def upload_path
       base_dir = FileUploader.generate_dir
diff --git a/app/services/projects/participants_service.rb b/app/services/projects/participants_service.rb
index c4d2c0963b7..e3b33de8d02 100644
--- a/app/services/projects/participants_service.rb
+++ b/app/services/projects/participants_service.rb
@@ -5,11 +5,12 @@ module Projects
     end
 
     def execute(note_type, note_id)
-      participating = if note_type && note_id
-                      participants_in(note_type, note_id)
-                    else
-                      []
-                    end
+      participating =
+        if note_type && note_id
+          participants_in(note_type, note_id)
+        else
+          []
+        end
       team_members = sorted(@project.team.members)
       participants = all_members + team_members + participating
       participants.uniq