Merge pull request #979 from rud/chore/rubocop-newline-fixes

Chore/rubocop newline fixes

Merge pull request #979 from rud/chore/rubocop-newline-fixes
Chore/rubocop newline fixes
Stephen Crosby
2 parents 06569f9d ed97fdfe
Showing 64 changed files with 34 additions and 162 deletions Show diff stats
.rubocop.yml
.rubocop_todo.yml
Gemfile
app/controllers/api/v1/notices_controller.rb
app/controllers/api/v1/problems_controller.rb
app/controllers/api/v1/stats_controller.rb
app/controllers/apps_controller.rb
app/controllers/deploys_controller.rb
app/controllers/notices_controller.rb
app/controllers/problems_controller.rb
app/controllers/problems_searcher.rb
app/controllers/users_controller.rb
app/decorators/app_decorator.rb
app/decorators/issue_tracker_field_decorator.rb
app/decorators/watcher_decorator.rb
app/helpers/application_helper.rb
app/helpers/apps_helper.rb
app/helpers/form_helper.rb
app/helpers/hash_helper.rb
app/helpers/navigation_helper.rb
@@ -8,3 +8,9 @@ AllCops:
 # returns nil
 Rails/FindBy:
   Enabled: false
+
+Style/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
+
+Style/ExtraSpacing:
+  AllowForAlignment: true
@@ -147,67 +147,6 @@ Style/EachWithObject:
     - 'app/models/notice_fingerprinter.rb'
     - 'lib/recurse.rb'
-# Offense count: 14
-# Cop supports --auto-correct.
-# Configuration parameters: AllowAdjacentOneLineDefs.
-Style/EmptyLineBetweenDefs:
-  Exclude:
-    - 'app/controllers/apps_controller.rb'
-    - 'app/controllers/users_controller.rb'
-    - 'app/models/notification_service.rb'
-    - 'spec/decorators/issue_tracker_decorator_spec.rb'
-    - 'spec/decorators/issue_tracker_type_decorator_spec.rb'
-    - 'spec/views/problems/show.html.haml_spec.rb'
-
-# Offense count: 12
-# Cop supports --auto-correct.
-Style/EmptyLines:
-  Exclude:
-    - 'app/controllers/api/v1/stats_controller.rb'
-    - 'app/decorators/issue_tracker_field_decorator.rb'
-    - 'app/models/app.rb'
-    - 'app/models/problem.rb'
-    - 'config/deploy/production.example.rb'
-    - 'lib/tasks/errbit/demo.rake'
-    - 'script/rspec-queue-mongoid.rb'
-    - 'spec/acceptance/app_regenerate_api_key_spec.rb'
-
-# Offense count: 28
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundBlockBody:
-  Enabled: false
-
-# Offense count: 26
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundClassBody:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/EmptyLinesAroundMethodBody:
-  Exclude:
-    - 'app/models/notification_services/hoiio_service.rb'
-    - 'app/models/notification_services/pushover_service.rb'
-
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundModuleBody:
-  Exclude:
-    - 'app/helpers/application_helper.rb'
-    - 'app/helpers/form_helper.rb'
-    - 'app/helpers/hash_helper.rb'
-    - 'app/helpers/navigation_helper.rb'
-    - 'app/helpers/sort_helper.rb'
-
-# Offense count: 22
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Style/ExtraSpacing:
-  Enabled: false
-
 # Offense count: 2
 # Configuration parameters: Exclude.
 Style/FileName:
@@ -29,7 +29,7 @@ gem &#39;htmlentities&#39;
 gem 'kaminari', '>= 0.14.1'
 gem 'mongoid', '5.0.0'
 gem 'mongoid_rails_migrations'
-gem 'rack-ssl', :require => 'rack/ssl'   # force SSL
+gem 'rack-ssl', :require => 'rack/ssl' # force SSL
 gem 'rack-ssl-enforcer', :require => false
 gem 'rails_autolink'
 gem 'useragent'
@@ -104,7 +104,7 @@ group :heroku, :production do
   gem 'unicorn', require: false, platform: 'ruby'
 end
-gem 'therubyracer', :platform => :ruby  # C Ruby (MRI) or Rubinius, but NOT Windows
+gem 'therubyracer', :platform => :ruby # C Ruby (MRI) or Rubinius, but NOT Windows
 gem 'sass-rails'
 gem 'uglifier'
 # We can't upgrade because not compatible to jquery >= 1.9.
@@ -17,8 +17,7 @@ class Api::V1::NoticesController &lt; ApplicationController
     respond_to do |format|
       format.any(:html, :json) { render :json => JSON.dump(results) } # render JSON if no extension specified on path
-      format.xml  { render :xml  => results }
+      format.xml { render :xml => results }
     end
   end
-
 end
@@ -14,7 +14,7 @@ class Api::V1::ProblemsController &lt; ApplicationController
     respond_to do |format|
       format.any(:html, :json) { render :json => result } # render JSON if no extension specified on path
-      format.xml  { render :xml  => result }
+      format.xml { render :xml => result }
     end
   end
@@ -33,8 +33,7 @@ class Api::V1::ProblemsController &lt; ApplicationController
     respond_to do |format|
       format.any(:html, :json) { render :json => JSON.dump(results) } # render JSON if no extension specified on path
-      format.xml  { render :xml  => results }
+      format.xml { render :xml => results }
     end
   end
-
 end
@@ -19,11 +19,10 @@ class Api::V1::StatsController &lt; ApplicationController
     respond_to do |format|
       format.any(:html, :json) { render :json => JSON.dump(stats) } # render JSON if no extension specified on path
-      format.xml  { render :xml  => stats }
+      format.xml { render :xml => stats }
     end
   end
-
   protected
   def require_api_key_or_authenticate_user!
@@ -35,5 +34,4 @@ class Api::V1::StatsController &lt; ApplicationController
     authenticate_user!
   end
-
 end
 class AppsController < ApplicationController
-
   include ProblemsSearcher
   before_action :require_admin!, :except => [:index, :show]
@@ -44,6 +43,7 @@ class AppsController &lt; ApplicationController
   }
   def index; end
+
   def show
     app
   end
 class DeploysController < ApplicationController
-
   protect_from_forgery :except => :create
   skip_before_action :verify_authenticity_token, :only => :create
@@ -40,6 +39,5 @@ class DeploysController &lt; ApplicationController
         :revision     => params[:head],
       }
     end
-
 end
 class NoticesController < ApplicationController
-
   class ParamsError < StandardError; end
   skip_before_action :authenticate_user!, only: :create
@@ -48,5 +47,4 @@ class NoticesController &lt; ApplicationController
   def bad_params(exception)
     render :text => exception.message, :status => :bad_request
   end
-
 end
@@ -5,7 +5,6 @@
 # MEMBER => :show, :edit, :update, :create, :destroy, :resolve, :unresolve, :create_issue, :unlink_issue
 # COLLECTION => :index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several, :search
 class ProblemsController < ApplicationController
-
   include ProblemsSearcher
   before_action :need_selected_problem, :only => [
@@ -5,7 +5,6 @@ module ProblemsSearcher
   extend ActiveSupport::Concern
   included do
-
     expose(:params_sort) {
       unless %w{app message last_notice_at last_deploy_at count}.member?(params[:sort])
         "last_notice_at"
@@ -29,6 +28,5 @@ module ProblemsSearcher
     expose(:err_ids) {
       (params[:problems] || []).compact
     }
-
   end
 end
@@ -72,6 +72,5 @@ class UsersController &lt; ApplicationController
   def user_password_params
     @user_password_params ||= params[:user] ? params.require(:user).permit(:password, :password_confirmation) : {}
   end
-
 end
 class AppDecorator < Draper::Decorator
-
   decorates_association :watchers
   decorates_association :issue_tracker, :with => IssueTrackerDecorator
   delegate_all
@@ -15,5 +14,4 @@ class AppDecorator &lt; Draper::Decorator
   def notify_err_display
     object.notify_on_errs ? '' : 'display: none;'
   end
-
 end
 class IssueTrackerFieldDecorator < Draper::Decorator
-
   def initialize(field, field_info)
     @object = field
     @field_info = field_info
@@ -12,7 +11,6 @@ class IssueTrackerFieldDecorator &lt; Draper::Decorator
     field_info[:label] || object.to_s.titleize
   end
-
   def input(form, issue_tracker)
     form.send(input_field, key.to_s,
               :placeholder => field_info[:placeholder],
 class WatcherDecorator < Draper::Decorator
-
   delegate_all
   def email_choosen
     object.email.blank? ? 'chosen' : ''
   end
-
 end
@@ -84,5 +84,4 @@ module ApplicationHelper
     def head_size
       4
     end
-
 end
@@ -42,10 +42,10 @@ module AppsHelper
     @any_github_repos = @any_issue_trackers = @any_deploys = @any_bitbucket_repos = @any_notification_services = false
     apps.each do |app|
-      @any_github_repos   ||= app.github_repo?
-      @any_bitbucket_repos   ||= app.bitbucket_repo?
-      @any_issue_trackers ||= app.issue_tracker_configured?
-      @any_deploys        ||= app.last_deploy_at.present?
+      @any_github_repos          ||= app.github_repo?
+      @any_bitbucket_repos       ||= app.bitbucket_repo?
+      @any_issue_trackers        ||= app.issue_tracker_configured?
+      @any_deploys               ||= app.last_deploy_at.present?
       @any_notification_services ||= app.notification_service_configured?
     end
   end
 module FormHelper
-
   def errors_for(document)
     return unless document.errors.any?
     content_tag(:div, :class => 'error-messages') do
-      body  = content_tag(:h2, 'Dang. The following errors are keeping this from being a success.')
+      body = content_tag(:h2, 'Dang. The following errors are keeping this from being a success.')
       body + content_tag(:ul) do
         document.errors.full_messages.inject('') {|errs, msg| errs + content_tag(:li, h(msg)) }.html_safe
       end
@@ -14,5 +13,4 @@ module FormHelper
   def label_for_attr(builder, field)
     (builder.object_name + field).gsub(/[\[\]]/,'_').squeeze('_')
   end
-
 end
 module HashHelper
-
   def pretty_hash(hash, nesting = 0)
     return '{}' if hash.empty?
@@ -13,10 +12,8 @@ module HashHelper
       pretty += "\n#{' '*nesting*tab_size}"
       pretty += "#{key.inspect} => #{val}"
       pretty += "," unless key == sorted_keys.last
-
     end
     nesting -= 1
     pretty += "\n#{' '*nesting*tab_size}}"
   end
-
 end
 module NavigationHelper
-
   # Returns ' active' if you are on a given controller
   #  - active_if_here(:users) => ' active' if users controller
   # Or on one of a list of controllers
@@ -44,5 +43,4 @@ module NavigationHelper
   def page_count_from_end(current_page, total_pages)
     (total_pages.to_i - current_page.to_i) + 1
   end
-
 end
 # encoding: utf-8
 module SortHelper
-
   def link_for_sort(name, field=nil)
     field ||= name.underscore
     current = (params_sort == field)
@@ -10,5 +9,4 @@ module SortHelper
     options.merge!(:class => "current #{order}") if current
     link_to(name, url, options)
   end
-
 end
 class ProblemDestroy
-
   attr_reader :problem
   def initialize(problem)
@@ -44,5 +43,4 @@ class ProblemDestroy
   def delete_comments
     Comment.delete_all(:_id => { '$in' => comments_id })
   end
-
 end
 require 'problem_destroy'
 class ResolvedProblemClearer
-
   ##
   # Clear all problem already resolved
   #
@@ -28,8 +28,8 @@ class Mailer &lt; ActionMailer::Base
   end
   def deploy_notification(deploy)
-    @deploy   = deploy
-    @app  = AppDecorator.new deploy.app
+    @deploy = deploy
+    @app = AppDecorator.new deploy.app
     errbit_headers 'App' => @app.name,
                    'Environment' => @deploy.environment,
@@ -89,7 +89,6 @@ class App
     (last_deploy = deploys.last) && last_deploy.created_at
   end
-
   # Legacy apps don't have notify_on_errs and notify_on_deploys params
   def notify_on_errs
     !(super == false)
@@ -133,7 +132,6 @@ class App
     "#{bitbucket_url}/src/#{repo_branch}/#{file}"
   end
-
   def issue_tracker_configured?
     issue_tracker.present? && issue_tracker.configured?
   end
@@ -143,7 +141,6 @@ class App
       notification_service.configured?
   end
-
   def notification_recipients
     if notify_all_users
       (User.all.map(&:email).reject(&:blank?) + watchers.map(&:address)).uniq
@@ -220,6 +217,5 @@ class App
       github_repo.sub!(/(git@|https?:\/\/)#{github_host}(\/|:)/, '')
       github_repo.sub!(/\.git$/, '')
     end
-
 end
@@ -37,5 +37,4 @@ class Comment
     def decrease_counter_cache
       err.inc(comments_count: -1) if err
     end
-
 end
@@ -43,6 +43,5 @@ class Deploy
         Mailer.deploy_notification(self).deliver_now
       end
     end
-
 end
@@ -17,5 +17,4 @@ class Err
   validates_presence_of :problem_id, :fingerprint
   delegate :app, :resolved?, :to => :problem
-
 end
@@ -22,7 +22,7 @@ class IssueTracker
   end
   def type_tracker
-    attributes['type_tracker'] ?  attributes['type_tracker'] : 'none'
+    attributes['type_tracker'] ? attributes['type_tracker'] : 'none'
   end
   # Allow the tracker to validate its own params
@@ -46,7 +46,7 @@ class NotificationServices::GtalkService &lt; NotificationService
     client.auth(api_token)
     #has to look like this to be formatted properly in the client
-    message =  """#{problem.app.name}
+    message = """#{problem.app.name}
 #{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id}
 #{notification_description problem}"""
@@ -37,6 +37,5 @@ class NotificationServices::HoiioService &lt; NotificationService
     room_id.split(',').each do |number|
       sms.send :dest => number, :msg => "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id} #{notification_description problem}"
     end
-
   end
 end
@@ -27,6 +27,5 @@ class NotificationServices::PushoverService &lt; NotificationService
     # send push notification to pushover
     notification.notify(api_token, "#{notification_description problem}", :priority => 1, :title => "Errbit Notification", :url => "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id}", :url_title => "Link to error")
-
   end
 end
@@ -12,7 +12,6 @@ class Problem
     user_agents: :user_agent_string
   }.freeze
-
   field :last_notice_at, :type => ActiveSupport::TimeWithZone, :default => Proc.new { Time.zone.now }
   field :first_notice_at, :type => ActiveSupport::TimeWithZone, :default => Proc.new { Time.zone.now }
   field :last_deploy_at, :type => Time
@@ -186,7 +185,6 @@ class Problem
     !resolved?
   end
-
   def self.merge!(*problems)
     ProblemMerge.new(problems).merge
   end
@@ -39,6 +39,5 @@ class Watcher
         self.user = self.user_id = nil
       end
     end
-
 end
 #!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require File.expand_path('../../config/boot', __FILE__)
 require 'rails/commands'
 # This file is used by Rack-based servers to start the application.
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 use Rack::Deflater
 run Rails.application
@@ -8,7 +8,6 @@ role :app, %w(deploy@example.com)
 role :web, %w(deploy@example.com)
 role :db,  %w(deploy@example.com)
-
 # Extended Server Syntax
 # ======================
 # This can be used to drop a more detailed server definition into the
@@ -17,7 +16,6 @@ role :db,  %w(deploy@example.com)
 server 'example.com', user: 'deploy', roles: %w(web app), my_property: :my_value
-
 # Custom SSH Options
 # ==================
 # You may pass any option but keep in mind that net/ssh understands a
 Rails.application.routes.draw do
-
   devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
   # Hoptoad Notifier Routes
@@ -21,7 +20,7 @@ Rails.application.routes.draw do
     end
   end
-  resources :problems,    :only => [:index] do
+  resources :problems, :only => [:index] do
     collection do
       post :destroy_several
       post :resolve_several
@@ -4,7 +4,6 @@ require &#39;ostruct&#39;
 # order to provide a consistent way to use configuration throughout your
 # application
 class Configurator
-
   # Run the configurator and return the processed values
   #
   # @example Simple mapping
@@ -18,7 +18,7 @@ module Hoptoad
     def self.get_version_processor(version)
       case version
       when /2\.[01234]/ then Hoptoad::V2
-      else;            raise ApiVersionError
+      else; raise ApiVersionError
       end
     end
 end
 class Hash
-
   # Apply a block to hash, and recursively apply that block
   # to each sub-hash or +types+.
   #
@@ -20,6 +19,5 @@ class Hash
     end
     yield h
   end
-
 end
@@ -64,7 +64,6 @@ namespace :errbit do
       end
     end
-
     Fabricate(:notice, :err => Fabricate(:err, :problem => Fabricate(:problem, :app => app)))
     puts "=== Created demo app: '#{app.name}', with example errors."
   end
@@ -5,7 +5,6 @@ require &#39;bundler&#39;
 Bundler.setup(:default, :development, :test)
 require 'test_queue/runner/rspec'
-
 class MongoidRspecRunner < TestQueue::Runner::RSpec
   def after_fork(num)
     super
@@ -35,7 +35,6 @@ feature &quot;Regeneration api_Key&quot; do
 end
 feature "Create an application" do
-
   let(:admin) { Fabricate(:admin) }
   let(:user) {
     Fabricate(:user_watcher, :app => app).user
@@ -55,7 +54,6 @@ feature &quot;Create an application&quot; do
     expect(App.where(:name => 'My new app').count).to eq 1
     expect(App.where(:name => 'My new app 2').count).to eq 0
-
     click_on I18n.t('shared.navigation.apps')
     click_on 'My new app'
     click_link I18n.t('apps.show.edit')
@@ -64,7 +62,6 @@ feature &quot;Create an application&quot; do
     page.has_content?(I18n.t('controllers.apps.flash.update.success'))
     expect(App.where(:name => 'My new app').count).to eq 0
     expect(App.where(:name => 'My new app 2').count).to eq 1
-
   end
   scenario "create an apps with issue tracker and edit it", :js => true do
 require 'acceptance/acceptance_helper'
 feature 'Sign in with GitHub' do
-
   background do
     allow(Errbit::Config).to receive(:github_authentication).and_return(true)
     Fabricate(:user, :github_login => 'nashby')
@@ -28,14 +28,12 @@ describe Api::V1::NoticesController, type: &#39;controller&#39; do
       end
       describe "given a date range" do
-
         it "should return only the notices created during the date range" do
           get :index, {:auth_token => @user.authentication_token, :start_date => "2012-08-01", :end_date => "2012-08-27"}
           expect(response).to be_success
           notices = JSON.load response.body
           expect(notices.length).to eq 3
         end
-
       end
       it "should return all notices" do
@@ -44,7 +42,6 @@ describe Api::V1::NoticesController, type: &#39;controller&#39; do
         notices = JSON.load response.body
         expect(notices.length).to eq 4
       end
-
     end
   end
 end
@@ -330,7 +330,6 @@ describe AppsController, type: &#39;controller&#39; do
   end
   describe "POST /apps/:id/regenerate_api_key" do
-
     context "like watcher" do
       before do
         sign_in watcher.user
@@ -340,7 +339,6 @@ describe AppsController, type: &#39;controller&#39; do
         post :regenerate_api_key, :id => 'foo'
         expect(request).to redirect_to root_path
       end
-
     end
     context "like admin" do
@@ -34,7 +34,6 @@ describe NoticesController, type: &#39;controller&#39; do
           expect(response.body).to match(%r{<id[^>]*>#{notice.id}</id>})
           expect(response.body).to match(%r{<url[^>]*>(.+)#{locate_path(notice.id)}</url>})
         end
-
       end
       it "generates a notice from xml in a data param [POST]" do
@@ -318,7 +318,6 @@ describe ProblemsController, type: &#39;controller&#39; do
     end
     context "POST /problems/unmerge_several" do
-
       it "should require at least one problem" do
         post :unmerge_several, :problems => []
         expect(request.flash[:notice]).to eql I18n.t('controllers.problems.flash.no_select_problem')
@@ -332,11 +331,9 @@ describe ProblemsController, type: &#39;controller&#39; do
           expect(merged_problem.reload.errs.length).to eq 1
         }.to change(Problem, :count).by(1)
       end
-
     end
     context "POST /problems/resolve_several" do
-
       it "should require at least one problem" do
         post :resolve_several, :problems => []
         expect(request.flash[:notice]).to eql I18n.t('controllers.problems.flash.no_select_problem')
@@ -360,7 +357,6 @@ describe ProblemsController, type: &#39;controller&#39; do
     end
     context "POST /problems/unresolve_several" do
-
       it "should require at least one problem" do
         post :unresolve_several, :problems => []
         expect(request.flash[:notice]).to eql I18n.t('controllers.problems.flash.no_select_problem')
@@ -34,7 +34,6 @@ describe UsersController, type: &#39;controller&#39; do
         expect(controller.user).to eq(user)
         expect(response).to render_template 'edit'
       end
-
     end
     context "PUT /users/:other_id" do
@@ -188,7 +187,6 @@ describe UsersController, type: &#39;controller&#39; do
         end
       end
       context "when the update is unsuccessful" do
-
         it "renders the edit page" do
           put :update, :id => user.to_param, :user => {:name => nil}
           expect(response).to render_template(:edit)
@@ -3,6 +3,7 @@ describe IssueTrackerDecorator do
     klass = Class.new(ErrbitPlugin::IssueTracker) {
       def self.label; 'fake'; end
       def self.note; 'a note'; end
+
       def self.fields
         {
           :foo => {:label => 'foo'},
@@ -3,12 +3,14 @@ describe IssueTrackerDecorator do
     klass = Class.new(ErrbitPlugin::IssueTracker) do
       def self.label; 'fake'; end
       def self.note; 'a note'; end
+
       def self.fields
         {
           :foo => {:label => 'foo'},
           :bar => {:label => 'bar'}
         }
       end
+
       def self.icons
         {
           one: ['text/plain', 'all your base are belong to us'],
@@ -12,7 +12,7 @@ end
 Fabricator(:watcher) do
   app
   watcher_type 'email'
-  email   { sequence(:email){|n| "email#{n}@example.com"} }
+  email { sequence(:email){|n| "email#{n}@example.com"} }
 end
 Fabricator(:user_watcher, :from => :watcher) do
 Fabricator :comment do
   user
-  body       'Test comment'
+  body 'Test comment'
   err(:fabricator => :problem)
 end
-Fabricator :notification_service  do
+Fabricator :notification_service do
   app
   room_id { sequence :word }
   api_token { sequence :word }
@@ -44,7 +44,6 @@ describe ProblemDestroy do
         problem_destroy.execute
       end
     end
-
   end
   context "in integration way" do
@@ -51,7 +51,7 @@ describe Mailer do
       p.notices_count = 3
       p
     end
-    let!(:user)   { Fabricate(:admin) }
+    let!(:user) { Fabricate(:admin) }
     let(:error_report) do
       instance_double(
         'ErrorReport',
@@ -292,7 +292,6 @@ describe ErrorReport do
       it 'return the notice' do
         expect(error_report.notice).to be_a Notice
       end
-
     end
   end
@@ -129,7 +129,6 @@ describe &quot;Callback on Notice&quot;, type: &#39;model&#39; do
   describe 'should not send a notification if a notification service is not' \
            'configured' do
-
     let(:notification_service) { Fabricate(:notification_service) }
     let(:app) { Fabricate(:app, notification_service: notification_service )}
     let(:notice_attrs) { notice_attrs_for.call(app.api_key) }
@@ -88,7 +88,6 @@ describe NotificationServices::GtalkService, type: &#39;model&#39; do
       @notification_service.room_id = ""
       @notification_service.create_notification(@problem)
     end
-
   end
   it "it should send a notification to room only" do
 describe NotificationServices, type: 'model' do
-
   let(:notice) { Fabricate :notice }
   let(:notification_service) { Fabricate :notification_service, :app => notice.app }
   let(:problem) { notice.problem }
@@ -18,7 +18,6 @@ describe &quot;apps/new.html.haml&quot;, type: &#39;view&#39; do
       expect(action_bar).to have_selector('a.button', :text => 'cancel')
     end
-
   end
   context "with unvalid app" do
@@ -104,7 +104,6 @@ describe &quot;problems/show.html.haml&quot;, type: &#39;view&#39; do
           render
           expect(view.content_for(:action_bar)).to_not match(/create issue/)
         end
-
       end
       context "with tracker associate on app" do
@@ -138,7 +137,6 @@ describe &quot;problems/show.html.haml&quot;, type: &#39;view&#39; do
               render
               expect(view.content_for(:action_bar)).to match(/create issue/)
             end
-
           end
           context "with problem with issue link" do
@@ -55,7 +55,6 @@ describe &#39;users/show.html.haml&#39;, type: &#39;view&#39; do
         render
         expect(view.content_for(:action_bar)).to have_selector('a.delete[data-confirm="%s"]' % I18n.t('.users.confirm_delete'))
       end
-
     end
   end
 end
	@@ -8,3 +8,9 @@ AllCops:		@@ -8,3 +8,9 @@ AllCops:
8	# returns nil	8	# returns nil
9	Rails/FindBy:	9	Rails/FindBy:
10	Enabled: false	10	Enabled: false
		11	+
		12	+Style/EmptyLineBetweenDefs:
		13	+ AllowAdjacentOneLineDefs: true
		14	+
		15	+Style/ExtraSpacing:
		16	+ AllowForAlignment: true
	@@ -147,67 +147,6 @@ Style/EachWithObject:		@@ -147,67 +147,6 @@ Style/EachWithObject:
147	- 'app/models/notice_fingerprinter.rb'	147	- 'app/models/notice_fingerprinter.rb'
148	- 'lib/recurse.rb'	148	- 'lib/recurse.rb'
149		149
150	-# Offense count: 14
151	-# Cop supports --auto-correct.
152	-# Configuration parameters: AllowAdjacentOneLineDefs.
153	-Style/EmptyLineBetweenDefs:
154	- Exclude:
155	- - 'app/controllers/apps_controller.rb'
156	- - 'app/controllers/users_controller.rb'
157	- - 'app/models/notification_service.rb'
158	- - 'spec/decorators/issue_tracker_decorator_spec.rb'
159	- - 'spec/decorators/issue_tracker_type_decorator_spec.rb'
160	- - 'spec/views/problems/show.html.haml_spec.rb'
161	-
162	-# Offense count: 12
163	-# Cop supports --auto-correct.
164	-Style/EmptyLines:
165	- Exclude:
166	- - 'app/controllers/api/v1/stats_controller.rb'
167	- - 'app/decorators/issue_tracker_field_decorator.rb'
168	- - 'app/models/app.rb'
169	- - 'app/models/problem.rb'
170	- - 'config/deploy/production.example.rb'
171	- - 'lib/tasks/errbit/demo.rake'
172	- - 'script/rspec-queue-mongoid.rb'
173	- - 'spec/acceptance/app_regenerate_api_key_spec.rb'
174	-
175	-# Offense count: 28
176	-# Cop supports --auto-correct.
177	-# Configuration parameters: EnforcedStyle, SupportedStyles.
178	-Style/EmptyLinesAroundBlockBody:
179	- Enabled: false
180	-
181	-# Offense count: 26
182	-# Cop supports --auto-correct.
183	-# Configuration parameters: EnforcedStyle, SupportedStyles.
184	-Style/EmptyLinesAroundClassBody:
185	- Enabled: false
186	-
187	-# Offense count: 2
188	-# Cop supports --auto-correct.
189	-Style/EmptyLinesAroundMethodBody:
190	- Exclude:
191	- - 'app/models/notification_services/hoiio_service.rb'
192	- - 'app/models/notification_services/pushover_service.rb'
193	-
194	-# Offense count: 9
195	-# Cop supports --auto-correct.
196	-# Configuration parameters: EnforcedStyle, SupportedStyles.
197	-Style/EmptyLinesAroundModuleBody:
198	- Exclude:
199	- - 'app/helpers/application_helper.rb'
200	- - 'app/helpers/form_helper.rb'
201	- - 'app/helpers/hash_helper.rb'
202	- - 'app/helpers/navigation_helper.rb'
203	- - 'app/helpers/sort_helper.rb'
204	-
205	-# Offense count: 22
206	-# Cop supports --auto-correct.
207	-# Configuration parameters: AllowForAlignment.
208	-Style/ExtraSpacing:
209	- Enabled: false
210	-
211	# Offense count: 2	150	# Offense count: 2
212	# Configuration parameters: Exclude.	151	# Configuration parameters: Exclude.
213	Style/FileName:	152	Style/FileName:
	@@ -29,7 +29,7 @@ gem 'htmlentities'		@@ -29,7 +29,7 @@ gem 'htmlentities'
29	gem 'kaminari', '>= 0.14.1'	29	gem 'kaminari', '>= 0.14.1'
30	gem 'mongoid', '5.0.0'	30	gem 'mongoid', '5.0.0'
31	gem 'mongoid_rails_migrations'	31	gem 'mongoid_rails_migrations'
32	-gem 'rack-ssl', :require => 'rack/ssl' # force SSL	32	+gem 'rack-ssl', :require => 'rack/ssl' # force SSL
33	gem 'rack-ssl-enforcer', :require => false	33	gem 'rack-ssl-enforcer', :require => false
34	gem 'rails_autolink'	34	gem 'rails_autolink'
35	gem 'useragent'	35	gem 'useragent'
	@@ -104,7 +104,7 @@ group :heroku, :production do		@@ -104,7 +104,7 @@ group :heroku, :production do
104	gem 'unicorn', require: false, platform: 'ruby'	104	gem 'unicorn', require: false, platform: 'ruby'
105	end	105	end
106		106
107	-gem 'therubyracer', :platform => :ruby # C Ruby (MRI) or Rubinius, but NOT Windows	107	+gem 'therubyracer', :platform => :ruby # C Ruby (MRI) or Rubinius, but NOT Windows
108	gem 'sass-rails'	108	gem 'sass-rails'
109	gem 'uglifier'	109	gem 'uglifier'
110	# We can't upgrade because not compatible to jquery >= 1.9.	110	# We can't upgrade because not compatible to jquery >= 1.9.
	@@ -5,7 +5,6 @@		@@ -5,7 +5,6 @@
5	# MEMBER => :show, :edit, :update, :create, :destroy, :resolve, :unresolve, :create_issue, :unlink_issue	5	# MEMBER => :show, :edit, :update, :create, :destroy, :resolve, :unresolve, :create_issue, :unlink_issue
6	# COLLECTION => :index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several, :search	6	# COLLECTION => :index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several, :search
7	class ProblemsController < ApplicationController	7	class ProblemsController < ApplicationController
8	-
9	include ProblemsSearcher	8	include ProblemsSearcher
10		9
11	before_action :need_selected_problem, :only => [	10	before_action :need_selected_problem, :only => [
	@@ -72,6 +72,5 @@ class UsersController < ApplicationController		@@ -72,6 +72,5 @@ class UsersController < ApplicationController
72	def user_password_params	72	def user_password_params
73	@user_password_params \|\|= params[:user] ? params.require(:user).permit(:password, :password_confirmation) : {}	73	@user_password_params \|\|= params[:user] ? params.require(:user).permit(:password, :password_confirmation) : {}
74	end	74	end
75	-
76	end	75	end
77		76
	@@ -84,5 +84,4 @@ module ApplicationHelper		@@ -84,5 +84,4 @@ module ApplicationHelper
84	def head_size	84	def head_size
85	4	85	4
86	end	86	end
87	-
88	end	87	end
1	require 'problem_destroy'	1	require 'problem_destroy'
2		2
3	class ResolvedProblemClearer	3	class ResolvedProblemClearer
4	-
5	##	4	##
6	# Clear all problem already resolved	5	# Clear all problem already resolved
7	#	6	#
	@@ -37,5 +37,4 @@ class Comment		@@ -37,5 +37,4 @@ class Comment
37	def decrease_counter_cache	37	def decrease_counter_cache
38	err.inc(comments_count: -1) if err	38	err.inc(comments_count: -1) if err
39	end	39	end
40	-
41	end	40	end
	@@ -43,6 +43,5 @@ class Deploy		@@ -43,6 +43,5 @@ class Deploy
43	Mailer.deploy_notification(self).deliver_now	43	Mailer.deploy_notification(self).deliver_now
44	end	44	end
45	end	45	end
46	-
47	end	46	end
48		47
	@@ -17,5 +17,4 @@ class Err		@@ -17,5 +17,4 @@ class Err
17	validates_presence_of :problem_id, :fingerprint	17	validates_presence_of :problem_id, :fingerprint
18		18
19	delegate :app, :resolved?, :to => :problem	19	delegate :app, :resolved?, :to => :problem
20	-
21	end	20	end