diff --git a/Gemfile b/Gemfile
index a57c2a7f1..7f2b0a878 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,7 +57,7 @@ gem 'whenever', require: false
 gem 'pg_search'
 
 gem 'ahoy_matey', '~> 1.4.2'
-gem 'groupdate', '~> 3.1.0'   # group temporary data
+gem 'groupdate', '~> 3.1.0' # group temporary data
 gem 'tolk', '~> 2.0.0' # Web interface for translations
 
 gem 'browser'
@@ -85,6 +85,7 @@ group :development, :test do
   gem 'capistrano3-delayed-job', '~> 1.0'
   gem "bullet"
   gem "faker"
+  gem 'rubocop', '~> 0.45.0', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 5e99a8030..4433d8458 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,7 +59,7 @@ GEM
     ancestry (2.2.1)
       activerecord (>= 3.0.0)
     arel (6.0.3)
-    ast (2.2.0)
+    ast (2.3.0)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
@@ -271,7 +271,7 @@ GEM
     orm_adapter (0.5.0)
     paranoia (2.2.0)
       activerecord (>= 4.0, < 5.1)
-    parser (2.3.0.6)
+    parser (2.3.1.4)
       ast (~> 2.2)
     pg (0.19.0)
     pg_search (1.0.6)
@@ -282,6 +282,7 @@ GEM
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
+    powerpack (0.1.1)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.6.4)
@@ -315,6 +316,7 @@ GEM
       activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (2.1.0)
     raindrops (0.16.0)
     rake (11.3.0)
     redcarpet (3.3.4)
@@ -346,6 +348,12 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    rubocop (0.45.0)
+      parser (>= 2.3.1.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     safe_yaml (1.0.4)
     safely_block (0.1.1)
@@ -412,6 +420,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.0.3)
       execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.1.1)
     unicorn (5.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -494,6 +503,7 @@ DEPENDENCIES
   rinku (~> 2.0.2)
   rollbar (~> 2.13.3)
   rspec-rails (~> 3.5)
+  rubocop (~> 0.45.0)
   sass-rails (~> 5.0, >= 5.0.4)
   savon
   social-share-button
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index c3d814b38..c46b6e42f 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -29,4 +29,4 @@ class AccountController < ApplicationController
       end
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/banners_controller.rb b/app/controllers/admin/banners_controller.rb
index dbf683b9a..c96c7c72b 100644
--- a/app/controllers/admin/banners_controller.rb
+++ b/app/controllers/admin/banners_controller.rb
@@ -38,6 +38,7 @@ class Admin::BannersController < Admin::BaseController
   end
 
   private
+
     def banner_params
       params.require(:banner).permit(:title, :description, :target_url, :style, :image, :post_started_at, :post_ended_at)
     end
@@ -53,4 +54,5 @@ class Admin::BannersController < Admin::BaseController
     def banner_imgs
       @banner_imgs = Setting.all.banner_img.map { |banner_img| [banner_img.value, banner_img.key.split('.')[1]] }
     end
+
 end
\ No newline at end of file
diff --git a/app/controllers/admin/comments_controller.rb b/app/controllers/admin/comments_controller.rb
index a0272f367..1f3d8e837 100644
--- a/app/controllers/admin/comments_controller.rb
+++ b/app/controllers/admin/comments_controller.rb
@@ -20,8 +20,9 @@ class Admin::CommentsController < Admin::BaseController
   end
 
   private
+
     def load_comment
       @comment = Comment.with_hidden.find(params[:id])
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index f7aa5c440..5fb5e3c13 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -3,4 +3,4 @@ class Admin::DashboardController < Admin::BaseController
   def index
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/debates_controller.rb b/app/controllers/admin/debates_controller.rb
index 0b0b31b8b..bbe4a06d7 100644
--- a/app/controllers/admin/debates_controller.rb
+++ b/app/controllers/admin/debates_controller.rb
@@ -29,4 +29,4 @@ class Admin::DebatesController < Admin::BaseController
       @debate = Debate.with_hidden.find(params[:id])
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/officials_controller.rb b/app/controllers/admin/officials_controller.rb
index 2d570c2dc..e0a0a86ca 100644
--- a/app/controllers/admin/officials_controller.rb
+++ b/app/controllers/admin/officials_controller.rb
@@ -25,8 +25,9 @@ class Admin::OfficialsController < Admin::BaseController
   end
 
   private
+
     def user_params
       params.require(:user).permit(:official_position, :official_level)
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/organizations_controller.rb b/app/controllers/admin/organizations_controller.rb
index 77f71ed65..b85460459 100644
--- a/app/controllers/admin/organizations_controller.rb
+++ b/app/controllers/admin/organizations_controller.rb
@@ -27,4 +27,4 @@ class Admin::OrganizationsController < Admin::BaseController
     redirect_to request.query_parameters.merge(action: :index)
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/proposals_controller.rb b/app/controllers/admin/proposals_controller.rb
index e7c4934fa..2a6dfd718 100644
--- a/app/controllers/admin/proposals_controller.rb
+++ b/app/controllers/admin/proposals_controller.rb
@@ -25,4 +25,4 @@ class Admin::ProposalsController < Admin::BaseController
       @proposal = Proposal.with_hidden.find(params[:id])
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 17bd364f3..f17afff4c 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -15,7 +15,9 @@ class Admin::SettingsController < Admin::BaseController
   end
 
   private
+
     def settings_params
       params.require(:setting).permit(:value)
     end
+
 end
\ No newline at end of file
diff --git a/app/controllers/admin/spending_proposals_controller.rb b/app/controllers/admin/spending_proposals_controller.rb
index e4c13e612..b5923f2f6 100644
--- a/app/controllers/admin/spending_proposals_controller.rb
+++ b/app/controllers/admin/spending_proposals_controller.rb
@@ -54,4 +54,4 @@ class Admin::SpendingProposalsController < Admin::BaseController
       @tags = ActsAsTaggableOn::Tag.spending_proposal_tags
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/stats_controller.rb b/app/controllers/admin/stats_controller.rb
index 7e5b902e9..3624174a5 100644
--- a/app/controllers/admin/stats_controller.rb
+++ b/app/controllers/admin/stats_controller.rb
@@ -32,4 +32,5 @@ class Admin::StatsController < Admin::BaseController
     @direct_messages = DirectMessage.count
     @users_who_have_sent_message = DirectMessage.select(:sender_id).distinct.count
   end
-end
+
+end
\ No newline at end of file
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index eed1c4fea..1e17e1c2d 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -30,4 +30,4 @@ class Admin::UsersController < Admin::BaseController
       @user = User.with_hidden.find(params[:id])
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/valuators_controller.rb b/app/controllers/admin/valuators_controller.rb
index 3e403c9fc..4b52a753e 100644
--- a/app/controllers/admin/valuators_controller.rb
+++ b/app/controllers/admin/valuators_controller.rb
@@ -30,8 +30,10 @@ class Admin::ValuatorsController < Admin::BaseController
   end
 
   private
+
     def create_params
       params[:valuator][:description] = nil if params[:valuator][:description].blank?
       params.require(:valuator).permit(:user_id, :description)
     end
-end
+
+end
\ No newline at end of file
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index df928aa02..0a0018c9f 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -77,4 +77,4 @@ class CommentsController < ApplicationController
       Notification.add(notifiable.author_id, notifiable) unless comment.author_id == notifiable.author_id
    end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb
index 3f4398797..ef5e60dcb 100644
--- a/app/controllers/concerns/commentable_actions.rb
+++ b/app/controllers/concerns/commentable_actions.rb
@@ -155,4 +155,4 @@ module CommentableActions
       nil
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/concerns/moderate_actions.rb b/app/controllers/concerns/moderate_actions.rb
index 792dacde0..05aa0e97f 100644
--- a/app/controllers/concerns/moderate_actions.rb
+++ b/app/controllers/concerns/moderate_actions.rb
@@ -4,9 +4,9 @@ module ModerateActions
 
   def index
     @resources = @resources.send(@current_filter)
-                       .send("sort_by_#{@current_order}")
-                       .page(params[:page])
-                       .per(50)
+                           .send("sort_by_#{@current_order}")
+                           .page(params[:page])
+                           .per(50)
     set_resources_instance
   end
 
diff --git a/app/controllers/concerns/polymorphic.rb b/app/controllers/concerns/polymorphic.rb
index 51c5768c9..10d64698d 100644
--- a/app/controllers/concerns/polymorphic.rb
+++ b/app/controllers/concerns/polymorphic.rb
@@ -1,6 +1,7 @@
 module Polymorphic
 
   private
+
     def resource
       @resource ||= instance_variable_get("@#{resource_name}")
     end
diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index 7d2149cad..fd10e503c 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -21,8 +21,8 @@ class DebatesController < ApplicationController
   respond_to :html, :js
 
   def index_customization
-     @featured_debates = @debates.featured
-     @proposal_successfull_exists = Proposal.successfull.exists?
+    @featured_debates = @debates.featured
+    @proposal_successfull_exists = Proposal.successfull.exists?
   end
 
   def show
@@ -55,4 +55,4 @@ class DebatesController < ApplicationController
       Debate
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/management/account_controller.rb b/app/controllers/management/account_controller.rb
index 85b9feea4..64e0ddf4d 100644
--- a/app/controllers/management/account_controller.rb
+++ b/app/controllers/management/account_controller.rb
@@ -6,6 +6,7 @@ class Management::AccountController < Management::BaseController
   end
 
   private
+
     def only_verified_users
       check_verified_user t("management.account.alert.unverified_user")
     end
diff --git a/app/controllers/management/dashboard_controller.rb b/app/controllers/management/dashboard_controller.rb
index abb605341..87b134270 100644
--- a/app/controllers/management/dashboard_controller.rb
+++ b/app/controllers/management/dashboard_controller.rb
@@ -3,4 +3,4 @@ class Management::DashboardController < Management::BaseController
   def index
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/management/document_verifications_controller.rb b/app/controllers/management/document_verifications_controller.rb
index 1b8fabcc2..510e4fa93 100644
--- a/app/controllers/management/document_verifications_controller.rb
+++ b/app/controllers/management/document_verifications_controller.rb
@@ -33,17 +33,17 @@ class Management::DocumentVerificationsController < Management::BaseController
 
   private
 
-  def document_verification_params
-    params.require(:document_verification).permit(:document_type, :document_number)
-  end
+    def document_verification_params
+      params.require(:document_verification).permit(:document_type, :document_number)
+    end
 
-  def set_document
-    session[:document_type] = params[:document_verification][:document_type]
-    session[:document_number] = params[:document_verification][:document_number]
-  end
+    def set_document
+      session[:document_type] = params[:document_verification][:document_type]
+      session[:document_number] = params[:document_verification][:document_number]
+    end
 
-  def clean_document_number
-    params[:document_verification][:document_number] = params[:document_verification][:document_number].gsub(/[^a-z0-9]+/i, "").upcase unless params[:document_verification][:document_number].blank?
-  end
+    def clean_document_number
+      params[:document_verification][:document_number] = params[:document_verification][:document_number].gsub(/[^a-z0-9]+/i, "").upcase unless params[:document_verification][:document_number].blank?
+    end
 
 end
\ No newline at end of file
diff --git a/app/controllers/management/email_verifications_controller.rb b/app/controllers/management/email_verifications_controller.rb
index 3558e6fbf..7d511fe4b 100644
--- a/app/controllers/management/email_verifications_controller.rb
+++ b/app/controllers/management/email_verifications_controller.rb
@@ -16,8 +16,8 @@ class Management::EmailVerificationsController < Management::BaseController
 
   private
 
-  def email_verification_params
-    params.require(:email_verification).permit(:document_type, :document_number, :email)
-  end
+    def email_verification_params
+      params.require(:email_verification).permit(:document_type, :document_number, :email)
+    end
 
 end
\ No newline at end of file
diff --git a/app/controllers/management/proposals_controller.rb b/app/controllers/management/proposals_controller.rb
index 2ce74d6d5..1a30526f5 100644
--- a/app/controllers/management/proposals_controller.rb
+++ b/app/controllers/management/proposals_controller.rb
@@ -53,4 +53,4 @@ class Management::ProposalsController < Management::BaseController
       @comment_flags = managed_user ? managed_user.comment_flags(comments) : {}
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/management/sessions_controller.rb b/app/controllers/management/sessions_controller.rb
index bca17bf4c..5d0587ae5 100644
--- a/app/controllers/management/sessions_controller.rb
+++ b/app/controllers/management/sessions_controller.rb
@@ -42,4 +42,4 @@ class Management::SessionsController < ActionController::Base
       end
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/management/user_invites_controller.rb b/app/controllers/management/user_invites_controller.rb
index cbe3d1914..4d9b4909f 100644
--- a/app/controllers/management/user_invites_controller.rb
+++ b/app/controllers/management/user_invites_controller.rb
@@ -10,4 +10,4 @@ class Management::UserInvitesController < Management::BaseController
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/moderation/users_controller.rb b/app/controllers/moderation/users_controller.rb
index 3255bb6cc..cd1fff9a5 100644
--- a/app/controllers/moderation/users_controller.rb
+++ b/app/controllers/moderation/users_controller.rb
@@ -21,13 +21,13 @@ class Moderation::UsersController < Moderation::BaseController
 
   private
 
-  def load_users
-    @users = User.with_hidden.search(params[:name_or_email]).page(params[:page]).for_render
-  end
+    def load_users
+      @users = User.with_hidden.search(params[:name_or_email]).page(params[:page]).for_render
+    end
 
-  def block_user
-    @user.block
-    Activity.log(current_user, :block, @user)
-  end
+    def block_user
+      @user.block
+      Activity.log(current_user, :block, @user)
+    end
 
 end
\ No newline at end of file
diff --git a/app/controllers/organizations/registrations_controller.rb b/app/controllers/organizations/registrations_controller.rb
index 503c26bc0..a77534d8c 100644
--- a/app/controllers/organizations/registrations_controller.rb
+++ b/app/controllers/organizations/registrations_controller.rb
@@ -24,6 +24,7 @@ class Organizations::RegistrationsController < Devise::RegistrationsController
   end
 
   protected
+
     def after_inactive_sign_up_path_for(resource)
       organizations_sign_up_success_path
     end
diff --git a/app/controllers/proposal_ballots_controller.rb b/app/controllers/proposal_ballots_controller.rb
index 4e3e99671..4171fcda8 100644
--- a/app/controllers/proposal_ballots_controller.rb
+++ b/app/controllers/proposal_ballots_controller.rb
@@ -5,4 +5,4 @@ class ProposalBallotsController < ApplicationController
     @proposal_ballots = Proposal.successfull.sort_by_confidence_score
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/proposal_notifications_controller.rb b/app/controllers/proposal_notifications_controller.rb
index fc9cdf3d8..36e265e38 100644
--- a/app/controllers/proposal_notifications_controller.rb
+++ b/app/controllers/proposal_notifications_controller.rb
@@ -26,8 +26,8 @@ class ProposalNotificationsController < ApplicationController
 
   private
 
-  def proposal_notification_params
-    params.require(:proposal_notification).permit(:title, :body, :proposal_id)
-  end
+    def proposal_notification_params
+      params.require(:proposal_notification).permit(:title, :body, :proposal_id)
+    end
 
 end
\ No newline at end of file
diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
index ede5b0f5d..9523a0df2 100644
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -107,4 +107,4 @@ class ProposalsController < ApplicationController
       @proposal_successfull_exists = Proposal.successfull.exists?
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 81eaa08cb..cbe43390b 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -44,4 +44,4 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
       @user.save || @user.save_requiring_finish_signup
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/valuation/spending_proposals_controller.rb b/app/controllers/valuation/spending_proposals_controller.rb
index d3bc585b1..623c9ac46 100644
--- a/app/controllers/valuation/spending_proposals_controller.rb
+++ b/app/controllers/valuation/spending_proposals_controller.rb
@@ -58,7 +58,7 @@ class Valuation::SpendingProposalsController < Valuation::BaseController
     end
 
     def params_for_current_valuator
-        params.merge({valuator_id: current_user.valuator.id})
+      params.merge({valuator_id: current_user.valuator.id})
     end
 
     def restrict_access_to_assigned_items
@@ -77,4 +77,4 @@ class Valuation::SpendingProposalsController < Valuation::BaseController
       @spending_proposal.errors.empty?
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/verification/letter_controller.rb b/app/controllers/verification/letter_controller.rb
index bf5033b32..998f42766 100644
--- a/app/controllers/verification/letter_controller.rb
+++ b/app/controllers/verification/letter_controller.rb
@@ -56,5 +56,4 @@ class Verification::LetterController < ApplicationController
       end
     end
 
-
-end
+end
\ No newline at end of file
diff --git a/app/controllers/verification/verified_user_controller.rb b/app/controllers/verification/verified_user_controller.rb
index 23045e451..e637bb232 100644
--- a/app/controllers/verification/verified_user_controller.rb
+++ b/app/controllers/verification/verified_user_controller.rb
@@ -9,6 +9,7 @@ class Verification::VerifiedUserController < ApplicationController
   end
 
   private
+
     def user_data_present?
       return false if @verified_users.blank?
 
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index fc43f5357..d0c650fa3 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -16,5 +16,4 @@ class WelcomeController < ApplicationController
     redirect_to verification_path if signed_in?
   end
 
-
 end
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 515a54deb..62d31cd05 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -5,7 +5,7 @@ module AdminHelper
   end
 
   def official_level_options
-    options = [["",0]]
+    options = [["", 0]]
     (1..5).each do |i|
       options << [[t("admin.officials.level_#{i}"), setting["official_level_#{i}_name"]].compact.join(': '), i]
     end
diff --git a/app/helpers/banners_helper.rb b/app/helpers/banners_helper.rb
index 548513c7d..a1505a39e 100644
--- a/app/helpers/banners_helper.rb
+++ b/app/helpers/banners_helper.rb
@@ -1,5 +1,7 @@
 module BannersHelper
+
   def has_banners
     @banners.count > 0
   end
+
 end
\ No newline at end of file
diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index 9d9d08075..13884237b 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -39,4 +39,5 @@ module CommentsHelper
       "" # Default not author class
     end
   end
-end
+
+end
\ No newline at end of file
diff --git a/app/helpers/debates_helper.rb b/app/helpers/debates_helper.rb
index 3c1aa02a7..8db989f61 100644
--- a/app/helpers/debates_helper.rb
+++ b/app/helpers/debates_helper.rb
@@ -1,6 +1,7 @@
 module DebatesHelper
 
-  def has_featured? 
+  def has_featured?
     Debate.all.featured.count > 0
   end
+
 end
\ No newline at end of file
diff --git a/app/helpers/embed_videos_helper.rb b/app/helpers/embed_videos_helper.rb
index b48799bf5..8633549f4 100644
--- a/app/helpers/embed_videos_helper.rb
+++ b/app/helpers/embed_videos_helper.rb
@@ -9,15 +9,15 @@ module EmbedVideosHelper
     end
 
     if server == "Vimeo"
-      regExp = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/
+      reg_exp = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/
       src =  "https://player.vimeo.com/video/"
     elsif server == "YouTube"
-      regExp = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/
+      reg_exp = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/
       src = "https://www.youtube.com/embed/"
     end
 
-    if regExp
-      match  = link.match(regExp)
+    if reg_exp
+      match = link.match(reg_exp)
     end
 
     if match and match[2]
diff --git a/app/helpers/flags_helper.rb b/app/helpers/flags_helper.rb
index b5ba67f41..715937c0f 100644
--- a/app/helpers/flags_helper.rb
+++ b/app/helpers/flags_helper.rb
@@ -26,4 +26,4 @@ module FlagsHelper
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/helpers/locales_helper.rb b/app/helpers/locales_helper.rb
index 7954cc908..717be9e9b 100644
--- a/app/helpers/locales_helper.rb
+++ b/app/helpers/locales_helper.rb
@@ -5,4 +5,4 @@ module LocalesHelper
     I18n.backend.translate(locale, "i18n.language.name", default: default)
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 2b907535f..7342393a7 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -1,4 +1,2 @@
 module NotificationsHelper
-
-
 end
diff --git a/app/helpers/proposals_helper.rb b/app/helpers/proposals_helper.rb
index 9eaa88549..578cd1d8e 100644
--- a/app/helpers/proposals_helper.rb
+++ b/app/helpers/proposals_helper.rb
@@ -2,19 +2,19 @@ module ProposalsHelper
 
   def progress_bar_percentage(proposal)
     case proposal.cached_votes_up
-      when 0 then 0
-      when 1..Proposal.votes_needed_for_success then (proposal.total_votes.to_f * 100 / Proposal.votes_needed_for_success).floor
-      else 100
+    when 0 then 0
+    when 1..Proposal.votes_needed_for_success then (proposal.total_votes.to_f * 100 / Proposal.votes_needed_for_success).floor
+    else 100
     end
   end
 
   def supports_percentage(proposal)
     percentage = (proposal.total_votes.to_f * 100 / Proposal.votes_needed_for_success)
     case percentage
-      when 0 then "0%"
-      when 0..(0.1) then "0.1%"
-      when (0.1)..100 then number_to_percentage(percentage, strip_insignificant_zeros: true, precision: 1)
-      else "100%"
+    when 0 then "0%"
+    when 0..(0.1) then "0.1%"
+    when (0.1)..100 then number_to_percentage(percentage, strip_insignificant_zeros: true, precision: 1)
+    else "100%"
     end
   end
 
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index cd90a8a39..ad844e29f 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -8,4 +8,4 @@ module SettingsHelper
     @all_settings ||= Hash[ Setting.all.map{|s| [s.key, s.value.presence]} ]
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/helpers/stats_helper.rb b/app/helpers/stats_helper.rb
index 097711b88..e481ef7e1 100644
--- a/app/helpers/stats_helper.rb
+++ b/app/helpers/stats_helper.rb
@@ -20,4 +20,5 @@ module StatsHelper
     opt[:data][:graph] = admin_api_stats_path(spending_proposals: true)
     content_tag :div, "", opt
   end
+
 end
diff --git a/app/helpers/tracks_helper.rb b/app/helpers/tracks_helper.rb
index 53c110d49..557d71802 100644
--- a/app/helpers/tracks_helper.rb
+++ b/app/helpers/tracks_helper.rb
@@ -1,4 +1,5 @@
 module TracksHelper
+
   def track_event(data={})
     track_data = ""
     prefix = " data-track-event-"
@@ -9,4 +10,5 @@ module TracksHelper
       track_data
     end
   end
+
 end
\ No newline at end of file
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 47beb5050..0bfb6a320 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -24,8 +24,8 @@ class Comment < ActiveRecord::Base
   scope :not_as_admin_or_moderator, -> { where("administrator_id IS NULL").where("moderator_id IS NULL")}
   scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) }
 
-  scope :sort_by_most_voted , -> { order(confidence_score: :desc, created_at: :desc) }
-  scope :sort_descendants_by_most_voted , -> { order(confidence_score: :desc, created_at: :asc) }
+  scope :sort_by_most_voted, -> { order(confidence_score: :desc, created_at: :desc) }
+  scope :sort_descendants_by_most_voted, -> { order(confidence_score: :desc, created_at: :asc) }
 
   scope :sort_by_newest, -> { order(created_at: :desc) }
   scope :sort_descendants_by_newest, -> { order(created_at: :desc) }
@@ -95,7 +95,7 @@ class Comment < ActiveRecord::Base
   end
 
   def self.body_max_length
-    Setting['comments_body_max_length'].to_i 
+    Setting['comments_body_max_length'].to_i
   end
 
   def calculate_confidence_score
diff --git a/app/models/debate.rb b/app/models/debate.rb
index 840b9c4b5..020259d80 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -28,7 +28,7 @@ class Debate < ActiveRecord::Base
   before_save :calculate_hot_score, :calculate_confidence_score
 
   scope :for_render,               -> { includes(:tags) }
-  scope :sort_by_hot_score ,       -> { reorder(hot_score: :desc) }
+  scope :sort_by_hot_score,        -> { reorder(hot_score: :desc) }
   scope :sort_by_confidence_score, -> { reorder(confidence_score: :desc) }
   scope :sort_by_created_at,       -> { reorder(created_at: :desc) }
   scope :sort_by_most_commented,   -> { reorder(comments_count: :desc) }
diff --git a/app/models/notification.rb b/app/models/notification.rb
index c6c32eb8d..e993e55f8 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -49,4 +49,5 @@ class Notification < ActiveRecord::Base
   def linkable_resource
     notifiable.is_a?(ProposalNotification) ? notifiable.proposal : notifiable
   end
+
 end
\ No newline at end of file
diff --git a/app/models/user.rb b/app/models/user.rb
index 916c3d0b9..44250109c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,7 +2,7 @@ class User < ActiveRecord::Base
 
   include Verification
 
-  devise :database_authenticatable, :registerable, :confirmable, :recoverable, :rememberable, 
+  devise :database_authenticatable, :registerable, :confirmable, :recoverable, :rememberable,
          :trackable, :validatable, :omniauthable, :async, :password_expirable, :secure_validatable
 
   acts_as_voter
@@ -246,6 +246,7 @@ class User < ActiveRecord::Base
   delegate :can?, :cannot?, to: :ability
 
   private
+
     def clean_document_number
       self.document_number = self.document_number.gsub(/[^a-z0-9]+/i, "").upcase unless self.document_number.blank?
     end
@@ -257,4 +258,4 @@ class User < ActiveRecord::Base
       validator.validate(self)
     end
 
-end
+end
\ No newline at end of file
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 29682e8e1..30e282fec 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -59,4 +59,4 @@ Rails.application.configure do
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb
index 7b534897a..847a8c993 100644
--- a/config/initializers/acts_as_taggable_on.rb
+++ b/config/initializers/acts_as_taggable_on.rb
@@ -48,4 +48,4 @@ module ActsAsTaggableOn
       end
   end
 
-end
+end
\ No newline at end of file
diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index 230cd0196..441168667 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -80,11 +80,11 @@ end
 
 (1..40).each do |i|
   user = create_user("user#{i}@consul.dev")
-  level = [1,2,3].sample
-  if level >= 2 then
+  level = [1, 2, 3].sample
+  if level >= 2
     user.update(residence_verified_at: Time.now, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: Faker::Number.number(10), document_type: "1" )
   end
-  if level == 3 then
+  if level == 3
     user.update(verified_at: Time.now, document_number: Faker::Number.number(10) )
   end
 end
@@ -113,7 +113,7 @@ ActsAsTaggableOn::Tag.create!(name:  "Medio Ambiente", featured: true, kind: "ca
 puts "Creating Debates"
 
 tags = Faker::Lorem.words(25)
-(1..30).each do |i|
+(1..30).each do
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
   debate = Debate.create!(author: author,
@@ -128,7 +128,7 @@ end
 
 
 tags = ActsAsTaggableOn::Tag.where(kind: 'category')
-(1..30).each do |i|
+(1..30).each do
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
   debate = Debate.create!(author: author,
@@ -165,7 +165,7 @@ end
 puts "Creating Archived Proposals"
 
 tags = Faker::Lorem.words(25)
-(1..5).each do |i|
+(1..5).each do
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
   proposal = Proposal.create!(author: author,
@@ -185,7 +185,7 @@ end
 
 
 tags = ActsAsTaggableOn::Tag.where(kind: 'category')
-(1..30).each do |i|
+(1..30).each do
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
   proposal = Proposal.create!(author: author,
@@ -205,7 +205,7 @@ end
 
 puts "Commenting Debates"
 
-(1..100).each do |i|
+(1..100).each do
   author = User.reorder("RANDOM()").first
   debate = Debate.reorder("RANDOM()").first
   Comment.create!(user: author,
@@ -229,7 +229,7 @@ end
 
 puts "Commenting Comments"
 
-(1..200).each do |i|
+(1..200).each do
   author = User.reorder("RANDOM()").first
   parent = Comment.reorder("RANDOM()").first
   Comment.create!(user: author,
@@ -243,7 +243,7 @@ end
 
 puts "Voting Debates, Proposals & Comments"
 
-(1..100).each do |i|
+(1..100).each do
   voter  = not_org_users.reorder("RANDOM()").first
   vote   = [true, false].sample
   debate = Debate.reorder("RANDOM()").first
@@ -257,7 +257,7 @@ end
   comment.vote_by(voter: voter, vote: vote)
 end
 
-(1..100).each do |i|
+(1..100).each do
   voter  = User.level_two_or_three_verified.reorder("RANDOM()").first
   proposal = Proposal.reorder("RANDOM()").first
   proposal.vote_by(voter: voter, vote: true)
@@ -266,19 +266,19 @@ end
 
 puts "Flagging Debates & Comments"
 
-(1..40).each do |i|
+(1..40).each do
   debate = Debate.reorder("RANDOM()").first
   flagger = User.where(["users.id <> ?", debate.author_id]).reorder("RANDOM()").first
   Flag.flag(flagger, debate)
 end
 
-(1..40).each do |i|
+(1..40).each do
   comment = Comment.reorder("RANDOM()").first
   flagger = User.where(["users.id <> ?", comment.user_id]).reorder("RANDOM()").first
   Flag.flag(flagger, comment)
 end
 
-(1..40).each do |i|
+(1..40).each do
   proposal = Proposal.reorder("RANDOM()").first
   flagger = User.where(["users.id <> ?", proposal.author_id]).reorder("RANDOM()").first
   Flag.flag(flagger, proposal)
@@ -288,7 +288,7 @@ puts "Creating Spending Proposals"
 
 tags = Faker::Lorem.words(10)
 
-(1..60).each do |i|
+(1..60).each do
   geozone = Geozone.reorder("RANDOM()").first
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
diff --git a/db/migrate/20150716174358_devise_create_users.rb b/db/migrate/20150716174358_devise_create_users.rb
index 74adf30cd..c18355f3d 100644
--- a/db/migrate/20150716174358_devise_create_users.rb
+++ b/db/migrate/20150716174358_devise_create_users.rb
@@ -30,7 +30,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
       # t.string   :unlock_token # Only if unlock strategy is :email or :both
       # t.datetime :locked_at
 
-
       t.timestamps null: false
     end
 
diff --git a/db/migrate/20150808141306_create_simple_captcha_data.rb b/db/migrate/20150808141306_create_simple_captcha_data.rb
index 4573b2056..d636631f0 100644
--- a/db/migrate/20150808141306_create_simple_captcha_data.rb
+++ b/db/migrate/20150808141306_create_simple_captcha_data.rb
@@ -1,12 +1,12 @@
 class CreateSimpleCaptchaData < ActiveRecord::Migration
   def self.up
     create_table :simple_captcha_data do |t|
-      t.string :key, :limit => 40
-      t.string :value, :limit => 6
+      t.string :key, limit: 40
+      t.string :value, limit: 6
       t.timestamps
     end
-    
-    add_index :simple_captcha_data, :key, :name => "idx_key"
+
+    add_index :simple_captcha_data, :key, name: "idx_key"
   end
 
   def self.down
diff --git a/db/migrate/20150820103351_create_inappropiate_flags.rb b/db/migrate/20150820103351_create_inappropiate_flags.rb
index 982d9f705..45bb5cba8 100644
--- a/db/migrate/20150820103351_create_inappropiate_flags.rb
+++ b/db/migrate/20150820103351_create_inappropiate_flags.rb
@@ -1,12 +1,12 @@
 class CreateInappropiateFlags < ActiveRecord::Migration
   def change
-     create_table :inappropiate_flags do |t|
-       t.belongs_to :user, index: true, foreign_key: true
+    create_table :inappropiate_flags do |t|
+      t.belongs_to :user, index: true, foreign_key: true
 
-       t.string :flaggable_type
-       t.integer :flaggable_id
+      t.string :flaggable_type
+      t.integer :flaggable_id
 
-       t.timestamps
+      t.timestamps
     end
 
     add_index :inappropiate_flags, [:flaggable_type, :flaggable_id]
diff --git a/db/migrate/20160114110933_create_tolk_tables.rb b/db/migrate/20160114110933_create_tolk_tables.rb
index 160000ab0..d5e6db9d4 100644
--- a/db/migrate/20160114110933_create_tolk_tables.rb
+++ b/db/migrate/20160114110933_create_tolk_tables.rb
@@ -6,7 +6,7 @@ class CreateTolkTables < ActiveRecord::Migration
       t.datetime :updated_at
     end
 
-    add_index :tolk_locales, :name, :unique => true
+    add_index :tolk_locales, :name, unique: true
 
     create_table :tolk_phrases do |t|
       t.text     :key
@@ -19,17 +19,17 @@ class CreateTolkTables < ActiveRecord::Migration
       t.integer  :locale_id
       t.text     :text
       t.text     :previous_text
-      t.boolean  :primary_updated, :default => false
+      t.boolean  :primary_updated, default: false
       t.datetime :created_at
       t.datetime :updated_at
     end
 
-    add_index :tolk_translations, [:phrase_id, :locale_id], :unique => true
+    add_index :tolk_translations, [:phrase_id, :locale_id], unique: true
   end
 
   def self.down
-    remove_index :tolk_translations, :column => [:phrase_id, :locale_id]
-    remove_index :tolk_locales, :column => :name
+    remove_index :tolk_translations, column: [:phrase_id, :locale_id]
+    remove_index :tolk_locales, column: :name
 
     drop_table :tolk_translations
     drop_table :tolk_phrases
diff --git a/db/migrate/20160204134022_add_tsvector_to_debates.rb b/db/migrate/20160204134022_add_tsvector_to_debates.rb
index 1f15e4d6b..7b697347c 100644
--- a/db/migrate/20160204134022_add_tsvector_to_debates.rb
+++ b/db/migrate/20160204134022_add_tsvector_to_debates.rb
@@ -10,4 +10,4 @@ class AddTsvectorToDebates < ActiveRecord::Migration
     remove_column :debates, :tsv
   end
 
-end
+end
\ No newline at end of file
diff --git a/db/migrate/20160329160106_add_tsvector_to_spending_proposals.rb b/db/migrate/20160329160106_add_tsvector_to_spending_proposals.rb
index 080a8ebc9..c8c3d7f3e 100644
--- a/db/migrate/20160329160106_add_tsvector_to_spending_proposals.rb
+++ b/db/migrate/20160329160106_add_tsvector_to_spending_proposals.rb
@@ -5,4 +5,4 @@ class AddTsvectorToSpendingProposals < ActiveRecord::Migration
     add_index :spending_proposals, :tsv, using: "gin"
   end
 
-end
+end
\ No newline at end of file
diff --git a/lib/tasks/comments.rake b/lib/tasks/comments.rake
index 5b4f73278..67ca1ab7d 100644
--- a/lib/tasks/comments.rake
+++ b/lib/tasks/comments.rake
@@ -13,4 +13,4 @@ namespace :comments do
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/lib/tasks/proposals.rake b/lib/tasks/proposals.rake
index ddba8f913..447876cc2 100644
--- a/lib/tasks/proposals.rake
+++ b/lib/tasks/proposals.rake
@@ -1,4 +1,5 @@
 namespace :proposals do
+
   desc "Updates all proposals by recalculating their hot_score"
   task touch: :environment do
     Proposal.find_in_batches do |proposals|
@@ -6,4 +7,4 @@ namespace :proposals do
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/lib/tasks/spending_proposals.rake b/lib/tasks/spending_proposals.rake
index 365338d96..6e11b13e7 100644
--- a/lib/tasks/spending_proposals.rake
+++ b/lib/tasks/spending_proposals.rake
@@ -1,4 +1,5 @@
 namespace :spending_proposals do
+
   desc "Sends an email to the authors of unfeasible spending proposals"
   task send_unfeasible_emails: :environment do
     SpendingProposal.find_each do |spending_proposal|
@@ -18,4 +19,4 @@ namespace :spending_proposals do
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake
index ccb749f9a..a45d7fb34 100644
--- a/lib/tasks/users.rake
+++ b/lib/tasks/users.rake
@@ -82,6 +82,6 @@ namespace :users do
     User.all.each do |user|
       user.update(password_changed_at: user.created_at)
     end
-  end 
+  end
 
-end
+end
\ No newline at end of file
diff --git a/spec/features/admin/banners_spec.rb b/spec/features/admin/banners_spec.rb
index 8578778ed..463bb663e 100644
--- a/spec/features/admin/banners_spec.rb
+++ b/spec/features/admin/banners_spec.rb
@@ -1,6 +1,7 @@
 require 'rails_helper'
 
 feature 'Admin banners magement' do
+
   background do
     login_as(create(:administrator).user)
   end
@@ -124,8 +125,8 @@ feature 'Admin banners magement' do
     fill_in 'banner_description', with: 'Edited text'
 
     within('div#js-banner-style') do
-      expect(page).to have_selector('h2', :text => 'Modified title')
-      expect(page).to have_selector('h3', :text => 'Edited text')
+      expect(page).to have_selector('h2', text: 'Modified title')
+      expect(page).to have_selector('h3', text: 'Edited text')
     end
 
     click_button 'Save changes'
@@ -139,13 +140,14 @@ feature 'Admin banners magement' do
   end
 
   scenario 'Delete a banner' do
-    banner1 = create(:banner, title: 'Ugly banner',
-                              description: 'Bad text',
-                              target_url:  'http://www.url.com',
-                              style: 'banner-style.banner-one',
-                              image: 'banner-img.banner-one',
-                              post_started_at: (Time.now + 4.days),
-                              post_ended_at:   (Time.now + 10.days))
+    create(:banner, title: 'Ugly banner',
+                    description: 'Bad text',
+                    target_url:  'http://www.url.com',
+                    style: 'banner-style.banner-one',
+                    image: 'banner-img.banner-one',
+                    post_started_at: (Time.now + 4.days),
+                    post_ended_at:   (Time.now + 10.days))
+
     visit admin_root_path
 
     within("#side_menu") do
diff --git a/spec/features/admin/comments_spec.rb b/spec/features/admin/comments_spec.rb
index 34768596f..3de3395d0 100644
--- a/spec/features/admin/comments_spec.rb
+++ b/spec/features/admin/comments_spec.rb
@@ -98,4 +98,4 @@ feature 'Admin comments' do
     expect(current_url).to include('page=2')
   end
 
-end
+end
\ No newline at end of file
diff --git a/spec/features/admin/debates_spec.rb b/spec/features/admin/debates_spec.rb
index 43d12b081..c74825db7 100644
--- a/spec/features/admin/debates_spec.rb
+++ b/spec/features/admin/debates_spec.rb
@@ -91,4 +91,4 @@ feature 'Admin debates' do
     expect(current_url).to include('page=2')
   end
 
-end
+end
\ No newline at end of file
diff --git a/spec/features/admin/feature_flags_spec.rb b/spec/features/admin/feature_flags_spec.rb
index 55ea30837..4cb99a401 100644
--- a/spec/features/admin/feature_flags_spec.rb
+++ b/spec/features/admin/feature_flags_spec.rb
@@ -60,4 +60,5 @@ feature 'Admin feature flags' do
       expect(page).to have_link "Spending proposals"
     end
   end
+
 end
\ No newline at end of file
diff --git a/spec/features/admin/managers_spec.rb b/spec/features/admin/managers_spec.rb
index 100781446..54b8cc77a 100644
--- a/spec/features/admin/managers_spec.rb
+++ b/spec/features/admin/managers_spec.rb
@@ -33,5 +33,5 @@ feature 'Admin managers' do
       expect(page).to_not have_content @manager.name
     end
   end
-end
 
+end
\ No newline at end of file
diff --git a/spec/features/admin/settings_spec.rb b/spec/features/admin/settings_spec.rb
index 3673ccd4f..c92b4b525 100644
--- a/spec/features/admin/settings_spec.rb
+++ b/spec/features/admin/settings_spec.rb
@@ -27,4 +27,5 @@ feature 'Admin settings' do
 
     expect(page).to have_content 'Value updated'
   end
+
 end
\ No newline at end of file
diff --git a/spec/features/admin/spending_proposals_spec.rb b/spec/features/admin/spending_proposals_spec.rb
index fe1b87fc3..73b157fd9 100644
--- a/spec/features/admin/spending_proposals_spec.rb
+++ b/spec/features/admin/spending_proposals_spec.rb
@@ -665,4 +665,4 @@ feature 'Admin spending proposals' do
 
   end
 
-end
+end
\ No newline at end of file
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index d20c1c302..5dfd8dd0b 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -956,7 +956,6 @@ feature 'Debates' do
     end
   end
 
-
   context 'Suggesting debates' do
     scenario 'Shows up to 5 suggestions', :js do
       author = create(:user)
@@ -1029,7 +1028,6 @@ feature 'Debates' do
     end
   end
 
-
   scenario 'Index include featured debates' do
     admin = create(:administrator)
     login_as(admin.user)
diff --git a/spec/features/tags_spec.rb b/spec/features/tags_spec.rb
index 7ac81c139..4ca42f5eb 100644
--- a/spec/features/tags_spec.rb
+++ b/spec/features/tags_spec.rb
@@ -198,4 +198,4 @@ feature 'Tags' do
 
   end
 
-end
+end
\ No newline at end of file
diff --git a/spec/features/tracks_spec.rb b/spec/features/tracks_spec.rb
index 059d2f679..a4b8a7ce6 100644
--- a/spec/features/tracks_spec.rb
+++ b/spec/features/tracks_spec.rb
@@ -3,24 +3,24 @@ require 'rails_helper'
 feature 'Tracking' do
 
   context 'Custom variable' do
-    
+
      scenario 'Usertype anonymous' do
       visit proposals_path
-      
-      expect(page.html).to include "anonymous"    
+
+      expect(page.html).to include "anonymous"
     end
 
-    scenario 'Usertype level_1_user' do  
+    scenario 'Usertype level_1_user' do
       create(:geozone)
       user = create(:user)
       login_as(user)
 
       visit proposals_path
-      
+
       expect(page.html).to include "level_1_user"
     end
 
-    scenario 'Usertype level_2_user' do  
+    scenario 'Usertype level_2_user' do
       create(:geozone)
       user = create(:user)
       login_as(user)
@@ -36,12 +36,12 @@ feature 'Tracking' do
       user = user.reload
       fill_in 'sms_confirmation_code', with: user.sms_confirmation_code
       click_button 'Send'
-      
+
       expect(page.html).to include "level_2_user"
-    end 
+    end
   end
 
-  context 'Tracking events' do 
+  context 'Tracking events' do
     scenario 'Verification: start census' do
       user = create(:user)
       login_as(user)
@@ -67,7 +67,7 @@ feature 'Tracking' do
       click_button 'Send'
 
       expect(page.html).to include "data-track-event-category=verification"
-      expect(page.html).to include "data-track-event-action=start_sms"   
+      expect(page.html).to include "data-track-event-action=start_sms"
     end
 
     scenario 'Verification: start sms' do
@@ -81,12 +81,12 @@ feature 'Tracking' do
       verify_residence
 
       fill_in 'sms_phone', with: "611111111"
-      click_button 'Send' 
+      click_button 'Send'
 
       expect(page.html).to include "data-track-event-category=verification"
-      expect(page.html).to include "data-track-event-action=start_sms"   
+      expect(page.html).to include "data-track-event-action=start_sms"
     end
-  
+
     scenario 'Verification: success sms' do
       create(:geozone)
       user = create(:user)
@@ -95,7 +95,7 @@ feature 'Tracking' do
       visit account_path
       click_link 'Verify my account'
 
-      verify_residence 
+      verify_residence
 
       fill_in 'sms_phone', with: "611111111"
       click_button 'Send'
@@ -128,7 +128,7 @@ feature 'Tracking' do
       click_link "Send me a letter with the code"
 
       expect(page.html).to include "data-track-event-category=verification"
-      expect(page.html).to include "data-track-event-action=start_letter"    
+      expect(page.html).to include "data-track-event-action=start_letter"
     end
   end
 end
diff --git a/spec/features/users_auth_spec.rb b/spec/features/users_auth_spec.rb
index 5b3c157d7..631ef57ba 100644
--- a/spec/features/users_auth_spec.rb
+++ b/spec/features/users_auth_spec.rb
@@ -52,7 +52,6 @@ feature 'Users' do
                                                uid: '12345',
                                                info: {name: 'manuela', email: 'manuelacarmena@example.com', verified: '1'}} }
 
-
       scenario 'Sign up when Oauth provider has a verified email' do
         OmniAuth.config.add_mock(:twitter, twitter_hash_with_verified_email)
 
@@ -289,16 +288,16 @@ feature 'Users' do
   scenario 'Sign in, admin with password expired' do
     user = create(:user, password_changed_at: Time.now - 1.year)
     admin = create(:administrator, user: user)
-    
+
     login_as(admin.user)
     visit root_path
-    
+
     expect(page).to have_content "Your password is expired"
 
     fill_in 'user_current_password', with: 'judgmentday'
     fill_in 'user_password', with: '123456789'
     fill_in 'user_password_confirmation', with: '123456789'
-  
+
     click_button 'Change your password'
 
     expect(page).to have_content "Password successfully updated"
@@ -307,37 +306,37 @@ feature 'Users' do
   scenario 'Sign in, admin without password expired' do
     user = create(:user, password_changed_at: Time.now - 360.days)
     admin = create(:administrator, user: user)
-    
+
     login_as(admin.user)
     visit root_path
 
-    expect(page).to_not have_content "Your password is expired" 
+    expect(page).to_not have_content "Your password is expired"
   end
 
   scenario 'Sign in, user with password expired' do
     user = create(:user, password_changed_at: Time.now - 1.year)
-    
+
     login_as(user)
     visit root_path
 
     expect(page).to_not have_content "Your password is expired"
   end
 
-  scenario 'Admin with password expired trying to use same password' do 
+  scenario 'Admin with password expired trying to use same password' do
     user = create(:user, password_changed_at: Time.now - 1.year, password: '123456789')
-    admin = create(:administrator, user: user)  
-    
-    login_as(admin.user)  
+    admin = create(:administrator, user: user)
+
+    login_as(admin.user)
     visit root_path
 
-    expect(page).to have_content "Your password is expired" 
-    
-    fill_in 'user_current_password', with: 'judgmentday'
-    fill_in 'user_password', with: '123456789' 
-    fill_in 'user_password_confirmation', with: '123456789'
-    click_button 'Change your password'  
-    
-    expect(page).to have_content "must be different than the current password."
-  end              
+    expect(page).to have_content "Your password is expired"
 
-end
+    fill_in 'user_current_password', with: 'judgmentday'
+    fill_in 'user_password', with: '123456789'
+    fill_in 'user_password_confirmation', with: '123456789'
+    click_button 'Change your password'
+
+    expect(page).to have_content "must be different than the current password."
+  end
+
+end
\ No newline at end of file
diff --git a/spec/features/verification/verification_path_spec.rb b/spec/features/verification/verification_path_spec.rb
index c6da931df..6ed9397bb 100644
--- a/spec/features/verification/verification_path_spec.rb
+++ b/spec/features/verification/verification_path_spec.rb
@@ -98,4 +98,5 @@ feature 'Verification path' do
       expect(page).to have_content 'Your account is already verified'
     end
   end
+
 end
\ No newline at end of file
diff --git a/spec/lib/email_digests_spec.rb b/spec/lib/email_digests_spec.rb
index ae2122793..27df17399 100644
--- a/spec/lib/email_digests_spec.rb
+++ b/spec/lib/email_digests_spec.rb
@@ -85,7 +85,7 @@ describe EmailDigest do
       user = create(:user)
 
       proposal_notification = create(:proposal_notification)
-      notification = create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.now)
+      create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.now)
 
       reset_mailer
       email_digest = EmailDigest.new(user)
diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb
index 39c052861..de144c10a 100644
--- a/spec/models/proposal_spec.rb
+++ b/spec/models/proposal_spec.rb
@@ -651,28 +651,28 @@ describe Proposal do
     context "no results" do
 
       it "no words match" do
-        proposal = create(:proposal, title: 'save world')
+        create(:proposal, title: 'save world')
 
         results = Proposal.search('destroy planet')
         expect(results).to eq([])
       end
 
       it "too many typos" do
-        proposal = create(:proposal, title: 'fantastic')
+        create(:proposal, title: 'fantastic')
 
         results = Proposal.search('frantac')
         expect(results).to eq([])
       end
 
       it "too much stemming" do
-        proposal = create(:proposal, title: 'reloj')
+        create(:proposal, title: 'reloj')
 
         results = Proposal.search('superrelojimetro')
         expect(results).to eq([])
       end
 
       it "empty" do
-        proposal = create(:proposal, title: 'great')
+        create(:proposal, title: 'great')
 
         results = Proposal.search('')
         expect(results).to eq([])
diff --git a/spec/models/sms_spec.rb b/spec/models/sms_spec.rb
index 83723cb3c..8486a931f 100644
--- a/spec/models/sms_spec.rb
+++ b/spec/models/sms_spec.rb
@@ -19,4 +19,4 @@ describe Verification::Sms do
     expect(build(:verification_sms, phone: "555; DROP TABLE USERS")).to_not be_valid
   end
 
-end
+end
\ No newline at end of file
diff --git a/spec/models/spending_proposal_spec.rb b/spec/models/spending_proposal_spec.rb
index 911d97491..4ee7728ab 100644
--- a/spec/models/spending_proposal_spec.rb
+++ b/spec/models/spending_proposal_spec.rb
@@ -174,7 +174,7 @@ describe SpendingProposal do
       by_valuator = SpendingProposal.by_valuator(valuator1.id)
 
       expect(by_valuator.size).to eq(2)
-      expect(by_valuator.sort).to eq([spending_proposal1,spending_proposal3].sort)
+      expect(by_valuator.sort).to eq([spending_proposal1, spending_proposal3].sort)
     end
   end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c1d391b66..b9b01d29e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,7 +9,7 @@ RSpec.configure do |config|
 
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
-  config.include Devise::TestHelpers, :type => :controller
+  config.include Devise::TestHelpers, type: :controller
   config.include FactoryGirl::Syntax::Methods
   config.include(EmailSpec::Helpers)
   config.include(EmailSpec::Matchers)
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index 702683a5f..a0f32957d 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -159,7 +159,7 @@ module CommonActions
     expect(page).to have_selector('.in-favor a', visible: false)
   end
 
-   def expect_message_you_need_to_sign_in_to_vote_comments
+  def expect_message_you_need_to_sign_in_to_vote_comments
     expect(page).to have_content 'You must Sign in or Sign up to vote'
     expect(page).to have_selector('.participation-allowed', visible: false)
     expect(page).to have_selector('.participation-not-allowed', visible: true)
diff --git a/spec/support/verifiable.rb b/spec/support/verifiable.rb
index 5baa5739f..762a22df8 100644
--- a/spec/support/verifiable.rb
+++ b/spec/support/verifiable.rb
@@ -159,4 +159,5 @@ shared_examples_for "verifiable" do
       expect(user.verification_letter_sent?).to eq(false)
     end
   end
+
 end
\ No newline at end of file