Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds automatic formatter and fixes rubocop errors #1107

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 3 additions & 4 deletions .hound.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ruby:
config_file: .rubocop.yml
exclude:
-"config/initializers/wice_grid_config.rb"
# Run as commit-hook instead
rubocop:
enabled: false
java_script:
config_file: .javascript-style.json
exclude:
Expand Down
4 changes: 4 additions & 0 deletions .overcommit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
PreCommit:
StandardRb:
enabled: true
command: ['bundle', 'exec', 'standardrb', '--fix'] # Invoke within Bundler context
56 changes: 0 additions & 56 deletions .rubocop.yml

This file was deleted.

1 change: 1 addition & 0 deletions .standard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby_version: 2.5.0
26 changes: 13 additions & 13 deletions Capfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# Load DSL and Setup Up Stages
require 'capistrano/setup'
require "capistrano/setup"

# Includes default deployment tasks
require 'capistrano/deploy'
require "capistrano/deploy"

require 'capistrano/rbenv'
require "capistrano/rbenv"
set :rbenv_type, :user # or :system, depends on your rbenv setup

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

require 'capistrano/bundler'
require 'capistrano/rails/assets'
require 'capistrano/rails/migrations'
require 'capistrano/passenger'
require 'capistrano/sitemap_generator'
require 'rollbar/capistrano3'
require 'capistrano/scm/git'
install_plugin Capistrano::SCM::Git
require "capistrano/bundler"
require "capistrano/rails/assets"
require "capistrano/rails/migrations"
require "capistrano/passenger"
require "capistrano/sitemap_generator"
require "rollbar/capistrano3"
require "capistrano/scm/git"
install_plugin Capistrano::SCM::Git

# Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
Dir.glob("lib/capistrano/tasks/*.cap").each { |r| import r }
162 changes: 82 additions & 80 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,99 +1,101 @@
source 'https://rubygems.org'
source "https://rubygems.org"

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

gem 'rails', '5.1.6.2'
gem "rails", "5.1.6.2"

gem 'active_model_serializers', '~> 0.10.0'
gem 'bcrypt_pbkdf', '~> 1.1.0.rc1'
gem 'bootstrap-sass'
gem 'bootstrap-datepicker-rails'
gem 'cancancan'
gem 'carrierwave', '~> 0.11.2'
gem 'carrierwave_backgrounder', git: 'https://github.com/lardawge/carrierwave_backgrounder'
gem 'cookies_eu'
gem 'datetimepicker-rails', git: 'https://github.com/zpaulovics/datetimepicker-rails',
branch: 'master',
gem "active_model_serializers", "~> 0.10.0"
gem "bcrypt_pbkdf", "~> 1.1.0.rc1"
gem "bootstrap-sass"
gem "bootstrap-datepicker-rails"
gem "cancancan"
gem "carrierwave", "~> 0.11.2"
gem "carrierwave_backgrounder", git: "https://github.com/lardawge/carrierwave_backgrounder"
gem "cookies_eu"
gem "datetimepicker-rails", git: "https://github.com/zpaulovics/datetimepicker-rails",
branch: "master",
submodules: true
gem 'devise', '~> 4.7.1'
gem 'devise_token_auth', '~> 1.1.3'
gem 'ed25519', '~> 1.2', '>= 1.2.4'
gem 'ejs'
gem 'font-awesome-sass', '~> 5.6.1'
gem 'fotoramajs'
gem 'fullcalendar-rails'
gem 'globalize', git: 'https://github.com/globalize/globalize' # For rails 5.1 support
gem 'activemodel-serializers-xml'
gem 'globalize-accessors'
gem 'icalendar'
gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'jquery-ui-rails'
gem 'kaminari'
gem 'meta-tags'
gem 'mail', '>= 2.6.6.rc1'
gem 'mini_magick'
gem 'momentjs-rails'
gem 'nokogiri', '>=1.7'
gem 'pg'
gem 'paperclip', '>= 5.2.0'
gem 'pagedown-bootstrap-rails'
gem 'paranoia'
gem 'prawn-rails'
gem 'recaptcha', require: 'recaptcha/rails'
gem 'redcarpet'
gem 'redis', '< 4'
gem 'roadie-rails', '~> 1.3'
gem 'rollbar'
gem 'rpush'
gem 'routing-filter', '~> 0.6.2'
gem 'sassc-rails'
gem 'select2-rails'
gem 'sidekiq'
gem 'sidekiq-cron'
gem 'sidekiq-unique-jobs'
gem 'simple_form'
gem 'sitemap_generator'
gem 'turbolinks'
gem 'uglifier'
gem 'wice_grid', git: 'https://github.com/navro/wice_grid', branch: 'rails51'
gem "devise", "~> 4.7.1"
gem "devise_token_auth", "~> 1.1.3"
gem "ed25519", "~> 1.2", ">= 1.2.4"
gem "ejs"
gem "font-awesome-sass", "~> 5.6.1"
gem "fotoramajs"
gem "fullcalendar-rails"
gem "globalize", git: "https://github.com/globalize/globalize" # For rails 5.1 support
gem "activemodel-serializers-xml"
gem "globalize-accessors"
gem "icalendar"
gem "jquery-rails"
gem "jquery-turbolinks"
gem "jquery-ui-rails"
gem "kaminari"
gem "meta-tags"
gem "mail", ">= 2.6.6.rc1"
gem "mini_magick"
gem "momentjs-rails"
gem "nokogiri", ">=1.7"
gem "pg"
gem "paperclip", ">= 5.2.0"
gem "pagedown-bootstrap-rails"
gem "paranoia"
gem "prawn-rails"
gem "recaptcha", require: "recaptcha/rails"
gem "redcarpet"
gem "redis", "< 4"
gem "roadie-rails", "~> 1.3"
gem "rollbar"
gem "rpush"
gem "routing-filter", "~> 0.6.2"
gem "sassc-rails"
gem "select2-rails"
gem "sidekiq"
gem "sidekiq-cron"
gem "sidekiq-unique-jobs"
gem "simple_form"
gem "sitemap_generator"
gem "turbolinks"
gem "uglifier"
gem "wice_grid", git: "https://github.com/navro/wice_grid", branch: "rails51"

# To have a working JVM on server
group :staging, :production do
gem 'therubyracer', platform: :ruby
gem "therubyracer", platform: :ruby
end

group :development, :test do
gem 'better_errors', git: 'https://github.com/charliesome/better_errors' # For rails 5 support
gem 'capistrano', require: false
gem "better_errors", git: "https://github.com/charliesome/better_errors" # For rails 5 support
gem "capistrano", require: false
# Need 1.1.3 to load sprockets manifest file
gem 'capistrano-rails', require: false
gem 'capistrano-rbenv', require: false
gem 'capistrano-passenger', '>= 0.2.1', require: false
gem 'capybara'
gem 'factory_bot_rails'
gem 'dotenv-rails'
gem 'listen'
gem 'poltergeist'
gem 'pry-byebug'
gem 'pry-rails'
gem 'puma'
gem 'rspec-example_steps'
gem 'rspec-rails'
gem "capistrano-rails", require: false
gem "capistrano-rbenv", require: false
gem "capistrano-passenger", ">= 0.2.1", require: false
gem "capybara"
gem "factory_bot_rails"
gem "dotenv-rails"
gem "listen"
gem "poltergeist"
gem "pry-byebug"
gem "pry-rails"
gem "puma"
gem "rspec-example_steps"
gem "rspec-rails"
end

group :development do
gem 'bullet'
gem 'foreman'
gem 'onesky-rails'
gem 'web-console'
gem "bullet"
gem "foreman"
gem "onesky-rails"
gem "overcommit", "~> 0.58.0"
gem "standard", "~> 1.4"
gem "web-console"
end

group :test do
gem 'codeclimate-test-reporter', require: false
gem 'database_cleaner'
gem 'shoulda-matchers', require: false
gem 'rails-controller-testing'
gem 'rspec_junit_formatter'
gem "codeclimate-test-reporter", require: false
gem "database_cleaner"
gem "shoulda-matchers", require: false
gem "rails-controller-testing"
gem "rspec_junit_formatter"
end
Loading