Skip to content

Commit 63e78b0

Browse files
committed
Run standard on all files
1 parent 68eddf5 commit 63e78b0

File tree

461 files changed

+4882
-4941
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

461 files changed

+4882
-4941
lines changed

Capfile

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# Load DSL and Setup Up Stages
2-
require 'capistrano/setup'
2+
require "capistrano/setup"
33

44
# Includes default deployment tasks
5-
require 'capistrano/deploy'
5+
require "capistrano/deploy"
66

7-
require 'capistrano/rbenv'
7+
require "capistrano/rbenv"
88
set :rbenv_type, :user # or :system, depends on your rbenv setup
99

1010
# Do not forget to update in .ruby-version, circle.yml and Gemfile
11-
set :rbenv_ruby, '2.5.0'
11+
set :rbenv_ruby, "2.5.0"
1212

13-
require 'capistrano/bundler'
14-
require 'capistrano/rails/assets'
15-
require 'capistrano/rails/migrations'
16-
require 'capistrano/passenger'
17-
require 'capistrano/sitemap_generator'
18-
require 'rollbar/capistrano3'
19-
require 'capistrano/scm/git'
20-
install_plugin Capistrano::SCM::Git
13+
require "capistrano/bundler"
14+
require "capistrano/rails/assets"
15+
require "capistrano/rails/migrations"
16+
require "capistrano/passenger"
17+
require "capistrano/sitemap_generator"
18+
require "rollbar/capistrano3"
19+
require "capistrano/scm/git"
20+
install_plugin Capistrano::SCM::Git
2121

2222
# Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
23-
Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
23+
Dir.glob("lib/capistrano/tasks/*.cap").each { |r| import r }

Gemfile

+81-81
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
1-
source 'https://rubygems.org'
1+
source "https://rubygems.org"
22

33
# Do not forget to update in .ruby-version, Capfile and circle.yml
4-
ruby '2.5.0'
4+
ruby "2.5.0"
55

6-
gem 'rails', '5.1.6.2'
6+
gem "rails", "5.1.6.2"
77

8-
gem 'active_model_serializers', '~> 0.10.0'
9-
gem 'bcrypt_pbkdf', '~> 1.1.0.rc1'
10-
gem 'bootstrap-sass'
11-
gem 'bootstrap-datepicker-rails'
12-
gem 'cancancan'
13-
gem 'carrierwave', '~> 0.11.2'
14-
gem 'carrierwave_backgrounder', git: 'https://github.com/lardawge/carrierwave_backgrounder'
15-
gem 'cookies_eu'
16-
gem 'datetimepicker-rails', git: 'https://github.com/zpaulovics/datetimepicker-rails',
17-
branch: 'master',
8+
gem "active_model_serializers", "~> 0.10.0"
9+
gem "bcrypt_pbkdf", "~> 1.1.0.rc1"
10+
gem "bootstrap-sass"
11+
gem "bootstrap-datepicker-rails"
12+
gem "cancancan"
13+
gem "carrierwave", "~> 0.11.2"
14+
gem "carrierwave_backgrounder", git: "https://github.com/lardawge/carrierwave_backgrounder"
15+
gem "cookies_eu"
16+
gem "datetimepicker-rails", git: "https://github.com/zpaulovics/datetimepicker-rails",
17+
branch: "master",
1818
submodules: true
19-
gem 'devise', '~> 4.7.1'
20-
gem 'devise_token_auth', '~> 1.1.3'
21-
gem 'ed25519', '~> 1.2', '>= 1.2.4'
22-
gem 'ejs'
23-
gem 'font-awesome-sass', '~> 5.6.1'
24-
gem 'fotoramajs'
25-
gem 'fullcalendar-rails'
26-
gem 'globalize', git: 'https://github.com/globalize/globalize' # For rails 5.1 support
27-
gem 'activemodel-serializers-xml'
28-
gem 'globalize-accessors'
29-
gem 'icalendar'
30-
gem 'jquery-rails'
31-
gem 'jquery-turbolinks'
32-
gem 'jquery-ui-rails'
33-
gem 'kaminari'
34-
gem 'meta-tags'
35-
gem 'mail', '>= 2.6.6.rc1'
36-
gem 'mini_magick'
37-
gem 'momentjs-rails'
38-
gem 'nokogiri', '>=1.7'
39-
gem 'pg'
40-
gem 'paperclip', '>= 5.2.0'
41-
gem 'pagedown-bootstrap-rails'
42-
gem 'paranoia'
43-
gem 'prawn-rails'
44-
gem 'recaptcha', require: 'recaptcha/rails'
45-
gem 'redcarpet'
46-
gem 'redis', '< 4'
47-
gem 'roadie-rails', '~> 1.3'
48-
gem 'rollbar'
49-
gem 'rpush'
50-
gem 'routing-filter', '~> 0.6.2'
51-
gem 'sassc-rails'
52-
gem 'select2-rails'
53-
gem 'sidekiq'
54-
gem 'sidekiq-cron'
55-
gem 'sidekiq-unique-jobs'
56-
gem 'simple_form'
57-
gem 'sitemap_generator'
58-
gem 'turbolinks'
59-
gem 'uglifier'
60-
gem 'wice_grid', git: 'https://github.com/navro/wice_grid', branch: 'rails51'
19+
gem "devise", "~> 4.7.1"
20+
gem "devise_token_auth", "~> 1.1.3"
21+
gem "ed25519", "~> 1.2", ">= 1.2.4"
22+
gem "ejs"
23+
gem "font-awesome-sass", "~> 5.6.1"
24+
gem "fotoramajs"
25+
gem "fullcalendar-rails"
26+
gem "globalize", git: "https://github.com/globalize/globalize" # For rails 5.1 support
27+
gem "activemodel-serializers-xml"
28+
gem "globalize-accessors"
29+
gem "icalendar"
30+
gem "jquery-rails"
31+
gem "jquery-turbolinks"
32+
gem "jquery-ui-rails"
33+
gem "kaminari"
34+
gem "meta-tags"
35+
gem "mail", ">= 2.6.6.rc1"
36+
gem "mini_magick"
37+
gem "momentjs-rails"
38+
gem "nokogiri", ">=1.7"
39+
gem "pg"
40+
gem "paperclip", ">= 5.2.0"
41+
gem "pagedown-bootstrap-rails"
42+
gem "paranoia"
43+
gem "prawn-rails"
44+
gem "recaptcha", require: "recaptcha/rails"
45+
gem "redcarpet"
46+
gem "redis", "< 4"
47+
gem "roadie-rails", "~> 1.3"
48+
gem "rollbar"
49+
gem "rpush"
50+
gem "routing-filter", "~> 0.6.2"
51+
gem "sassc-rails"
52+
gem "select2-rails"
53+
gem "sidekiq"
54+
gem "sidekiq-cron"
55+
gem "sidekiq-unique-jobs"
56+
gem "simple_form"
57+
gem "sitemap_generator"
58+
gem "turbolinks"
59+
gem "uglifier"
60+
gem "wice_grid", git: "https://github.com/navro/wice_grid", branch: "rails51"
6161

6262
# To have a working JVM on server
6363
group :staging, :production do
64-
gem 'therubyracer', platform: :ruby
64+
gem "therubyracer", platform: :ruby
6565
end
6666

6767
group :development, :test do
68-
gem 'better_errors', git: 'https://github.com/charliesome/better_errors' # For rails 5 support
69-
gem 'capistrano', require: false
68+
gem "better_errors", git: "https://github.com/charliesome/better_errors" # For rails 5 support
69+
gem "capistrano", require: false
7070
# Need 1.1.3 to load sprockets manifest file
71-
gem 'capistrano-rails', require: false
72-
gem 'capistrano-rbenv', require: false
73-
gem 'capistrano-passenger', require: false
74-
gem 'capybara'
75-
gem 'factory_bot_rails'
76-
gem 'dotenv-rails'
77-
gem 'listen'
78-
gem 'poltergeist'
79-
gem 'pry-byebug'
80-
gem 'pry-rails'
81-
gem 'puma'
82-
gem 'rspec-example_steps'
83-
gem 'rspec-rails'
71+
gem "capistrano-rails", require: false
72+
gem "capistrano-rbenv", require: false
73+
gem "capistrano-passenger", require: false
74+
gem "capybara"
75+
gem "factory_bot_rails"
76+
gem "dotenv-rails"
77+
gem "listen"
78+
gem "poltergeist"
79+
gem "pry-byebug"
80+
gem "pry-rails"
81+
gem "puma"
82+
gem "rspec-example_steps"
83+
gem "rspec-rails"
8484
end
8585

8686
group :development do
87-
gem 'bullet'
88-
gem 'foreman'
89-
gem 'onesky-rails'
90-
gem 'standard', '~> 1.3'
91-
gem 'web-console'
87+
gem "bullet"
88+
gem "foreman"
89+
gem "onesky-rails"
90+
gem "standard", "~> 1.3"
91+
gem "web-console"
9292
end
9393

9494
group :test do
95-
gem 'codeclimate-test-reporter', require: false
96-
gem 'database_cleaner'
97-
gem 'shoulda-matchers', require: false
98-
gem 'rails-controller-testing'
99-
gem 'rspec_junit_formatter'
95+
gem "codeclimate-test-reporter", require: false
96+
gem "database_cleaner"
97+
gem "shoulda-matchers", require: false
98+
gem "rails-controller-testing"
99+
gem "rspec_junit_formatter"
100100
end

Rakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Add your own tasks in files placed in lib/tasks ending in .rake,
22
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
33

4-
require File.expand_path('../config/application', __FILE__)
4+
require File.expand_path("../config/application", __FILE__)
55

66
Fsek::Application.load_tasks

app/channels/application_cable/connection.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class Connection < ActionCable::Connection::Base
44

55
def connect
66
self.current_user = find_verified_user
7-
logger.add_tags 'ActionCable', current_user.email
7+
logger.add_tags "ActionCable", current_user.email
88
end
99

1010
def ability
@@ -14,7 +14,7 @@ def ability
1414
protected
1515

1616
def find_verified_user
17-
cookie_user = env['warden'].user
17+
cookie_user = env["warden"].user
1818
token = request.params[:token]
1919

2020
if cookie_user.present?

app/channels/groups_channel.rb

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
class GroupsChannel < ApplicationCable::Channel
22
def subscribed
3-
group = Group.find(params['group_id'])
3+
group = Group.find(params["group_id"])
44

55
if ability.can?(:show, group)
6-
stream_from "groups_#{params['group_id']}_channel"
6+
stream_from "groups_#{params["group_id"]}_channel"
77
ConnectedList.add(current_user.id, group.id)
88
end
99
end
1010

1111
def unsubscribed
12-
ConnectedList.remove(current_user.id, params['group_id'])
12+
ConnectedList.remove(current_user.id, params["group_id"])
1313
end
1414

1515
def send_message(data)
16-
group = Group.find(data['group_id'])
16+
group = Group.find(data["group_id"])
1717
return unless ability.can?(:show, group) && !group.info?
1818

19-
params = { content: data['content'] }
19+
params = {content: data["content"]}
2020
MessageService.create_message(params, [group], current_user)
2121
end
2222

2323
def destroy_message(data)
24-
message = Message.find(data['message_id'])
24+
message = Message.find(data["message_id"])
2525
return unless ability.can?(:destroy, message)
2626

2727
MessageService.destroy_message(message)
2828
end
2929

3030
def update_message(data)
31-
message = Message.find(data['message_id'])
31+
message = Message.find(data["message_id"])
3232
return unless ability.can?(:update, message)
3333

34-
message.update!(content: data['content'])
34+
message.update!(content: data["content"])
3535
MessageService.broadcast_update(message)
3636
end
3737
end

app/controllers/admin/access_users_controller.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def update
2323
redirect_to(admin_access_users_path, notice: alert_update(AccessUser))
2424
else
2525
redirect_to(edit_admin_access_user_path(@access_user),
26-
notice: alert_danger(@access_user.errors.full_messages))
26+
notice: alert_danger(@access_user.errors.full_messages))
2727
end
2828
end
2929

app/controllers/admin/adventure_mission_groups_controller.rb

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
class Admin::AdventureMissionGroupsController < Admin::BaseController
22
load_permissions_and_authorize_resource
3-
load_and_authorize_resource :adventure, :except => [:update]
4-
load_and_authorize_resource :group, :only => [:index]
3+
load_and_authorize_resource :adventure, except: [:update]
4+
load_and_authorize_resource :group, only: [:index]
55

66
def index
77
adventure_mission_groups_pending = @adventure.adventure_mission_groups.where(pending: true)
88
adventure_mission_groups_accepted = @adventure.adventure_mission_groups.where(pending: false)
99
@grid_pending = initialize_grid(adventure_mission_groups_pending,
10-
include: [:group, :adventure_mission],
11-
per_page: 30)
10+
include: [:group, :adventure_mission],
11+
per_page: 30)
1212
@grid_accepted = initialize_grid(adventure_mission_groups_accepted,
13-
include: [:group, :adventure_mission],
14-
per_page: 30)
13+
include: [:group, :adventure_mission],
14+
per_page: 30)
1515
end
1616

1717
def edit
@@ -21,49 +21,49 @@ def edit
2121
def update
2222
# No validation here since there are admins doing this
2323
@adventure_mission_group.points = adventure_mission_group_params[:points]
24-
if adventure_mission_group_params[:pending].nil?
25-
@adventure_mission_group.pending = false
24+
@adventure_mission_group.pending = if adventure_mission_group_params[:pending].nil?
25+
false
2626
else
27-
@adventure_mission_group.pending = adventure_mission_group_params[:pending]
27+
adventure_mission_group_params[:pending]
2828
end
2929
if @adventure_mission_group.save(validate: false)
3030
redirect_to admin_group_adventures_path(group_id: @adventure_mission_group.group.id),
31-
notice: alert_success(t('.success'))
31+
notice: alert_success(t(".success"))
3232
else
3333
redirect_to edit_admin_adventure_mission_group_path(group: @group),
34-
alert: alert_errors(@adventure_mission_group.errors.full_messages)
34+
alert: alert_errors(@adventure_mission_group.errors.full_messages)
3535
end
3636
end
3737

3838
def destroy
3939
@group = @adventure_mission_group.group
4040
if @adventure_mission_group.destroy
41-
redirect_to admin_group_adventures_path(@group), notice: alert_success(t('.success'))
41+
redirect_to admin_group_adventures_path(@group), notice: alert_success(t(".success"))
4242
else
4343
redirect_to edit_admin_group_adventure_mission_group_path(@group, @adventure_mission_group),
44-
alert: alert_errors(@adventure_mission_group.errors.full_messages)
44+
alert: alert_errors(@adventure_mission_group.errors.full_messages)
4545
end
4646
end
4747

4848
def accept
4949
@adventure_mission_group = AdventureMissionGroup.find(params[:adventure_mission_group_id])
5050
if @adventure_mission_group.update_attribute(:pending, false)
5151
redirect_to admin_adventure_adventure_mission_groups_path(@adventure),
52-
notice: alert_success(t('.success'))
52+
notice: alert_success(t(".success"))
5353
else
5454
redirect_to admin_adventure_adventure_mission_groups_path(@adventure),
55-
alert: alert_danger(t('.fail'))
55+
alert: alert_danger(t(".fail"))
5656
end
5757
end
5858

5959
def decline
6060
@adventure_mission_group = AdventureMissionGroup.find(params[:adventure_mission_group_id])
6161
if @adventure_mission_group.update_attribute(:pending, true)
6262
redirect_to admin_adventure_adventure_mission_groups_path(@adventure),
63-
notice: alert_success(t('.success'))
63+
notice: alert_success(t(".success"))
6464
else
6565
redirect_to admin_adventure_adventure_mission_groups_path(@adventure),
66-
alert: alert_danger(t('.fail'))
66+
alert: alert_danger(t(".fail"))
6767
end
6868
end
6969

0 commit comments

Comments
 (0)