Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ sgemset
tags

.localeapp

.byebug_history
32 changes: 13 additions & 19 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ AllCops:
Naming/AccessorMethodName:
Enabled: false

Rails/ActionFilter:
Enabled: false

Style/Alias:
Enabled: false

Expand Down Expand Up @@ -57,15 +54,15 @@ Style/CommentAnnotation:
Metrics/CyclomaticComplexity:
Enabled: false

Rails/Delegate:
Enabled: false

Style/Documentation:
Enabled: false

Layout/DotPosition:
EnforcedStyle: trailing

Layout/ConditionPosition:
Enabled: false

Style/DoubleNegation:
Enabled: false

Expand All @@ -84,9 +81,6 @@ Style/EvenOdd:
Naming/FileName:
Enabled: false

Style/FlipFlop:
Enabled: false

Style/FormatString:
Enabled: false

Expand Down Expand Up @@ -114,7 +108,7 @@ Style/LambdaCall:
Style/LineEndConcatenation:
Enabled: false

Metrics/LineLength:
Layout/LineLength:
Max: 80

Metrics/MethodLength:
Expand Down Expand Up @@ -154,7 +148,7 @@ Style/PerlBackrefs:
Enabled: false

Naming/PredicateName:
NamePrefixBlacklist:
ForbiddenPrefixes:
- is_

Style/Proc:
Expand Down Expand Up @@ -187,16 +181,16 @@ Style/StringLiterals:
Style/VariableInterpolation:
Enabled: false

Style/TrailingCommaInLiteral:
Style/TrailingCommaInArrayLiteral:
Enabled: false

Style/TrailingCommaInArguments:
Style/TrailingCommaInHashLiteral:
Enabled: false

Style/TrivialAccessors:
Style/TrailingCommaInArguments:
Enabled: false

Style/VariableInterpolation:
Style/TrivialAccessors:
Enabled: false

Style/WhenThen:
Expand All @@ -214,16 +208,13 @@ Lint/AmbiguousRegexpLiteral:
Lint/AssignmentInCondition:
Enabled: false

Lint/ConditionPosition:
Enabled: false

Lint/DeprecatedClassMethods:
Enabled: false

Lint/ElseLayout:
Enabled: false

Lint/HandleExceptions:
Lint/SuppressedException:
Enabled: false

Lint/LiteralInInterpolation:
Expand All @@ -243,3 +234,6 @@ Lint/UnderscorePrefixedVariableName:

Lint/Void:
Enabled: false

Lint/FlipFlop:
Enabled: false
14 changes: 5 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,13 @@ gem 'unicorn'
gem 'kaminari', '~> 1.1.1'
gem "simple_form", ">= 3.0.0"
gem 'rollbar', '2.8.3'
gem 'whenever', require: false
gem 'prawn', '~> 2.2.0'
gem 'prawn-table', '~> 0.2.2'
gem 'elasticsearch-model'
gem 'elasticsearch-rails'
gem 'skylight'
gem 'sidekiq', '5.1.3'
gem 'sidekiq-cron', '0.6.3'
# TODO: remove this once the following issue has been addressed
# https://github.com/ondrejbartas/sidekiq-cron/issues/199
gem 'rufus-scheduler', '~> 3.4.2'
gem 'sidekiq-cron', '~> 1.1.0'

# Assets
gem 'jquery-rails', '>= 4.2.0'
Expand All @@ -39,7 +35,7 @@ gem 'select2-rails'
group :development do
gem "binding_of_caller", '~> 0.8.0'
gem "better_errors", '~> 2.4.0'
gem 'rubocop', '~> 0.52.1', require: false
gem 'rubocop', '~> 0.80.0', require: false
gem 'web-console', '2.1.3'
gem 'capistrano', '~> 3.1'
gem 'capistrano-rails', '~> 1.1'
Expand All @@ -51,17 +47,17 @@ group :development do
end

group :development, :test do
gem "byebug"
gem "byebug", '~> 11.0'
end

group :test do
gem "rspec-rails", '~> 3.8.2'
gem "database_cleaner", '1.6.2'
gem 'shoulda-matchers', '~> 3.1.2'
gem 'fabrication'
gem 'fabrication', '~> 2.20'
gem 'faker', '~> 1.9'
gem 'capybara', '~> 3.15'
gem 'selenium-webdriver', '~> 3.142'
gem 'webdrivers', '~> 4.1.2'
gem 'webdrivers', '~> 4.2.0'
gem 'simplecov', '~> 0.17', require: false
end
Loading