Skip to content
This repository has been archived by the owner on Nov 19, 2018. It is now read-only.

Update to Rails 5.1.0 #63

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
e0beb18
Update rails gems to 5.1.0
biow0lf Apr 30, 2017
613b962
Disable devise gem
biow0lf Apr 30, 2017
cab6690
Update vendor/cache/*
biow0lf Apr 30, 2017
e49449b
Update listen gem to 3.1.5
biow0lf Apr 30, 2017
9b1aca8
Update devise gem from github
biow0lf Apr 30, 2017
6401b5e
Update awesome_nested_set gem from git
biow0lf Apr 30, 2017
03b53a4
Sync with rails 5.1.0
biow0lf Apr 30, 2017
d3ec558
Sync with rails 5.1.0
biow0lf Apr 30, 2017
fe739c6
Sync with rails 5.1.0
biow0lf Apr 30, 2017
6837037
Sync with rails 5.1.0
biow0lf Apr 30, 2017
46f00da
Sync with rails 5.1.0
biow0lf Apr 30, 2017
d97cc8d
Remove fakeweb
biow0lf Apr 30, 2017
0880c82
Cleanup
biow0lf Apr 30, 2017
44a6cd6
Update git ignore
biow0lf Apr 30, 2017
1bcd9fd
Update deploy stuff
biow0lf Apr 30, 2017
157c517
Update deploy process
biow0lf Apr 30, 2017
2c375aa
Fix migrations
biow0lf Apr 30, 2017
6489096
Remove rectify gem
biow0lf Apr 30, 2017
df42d31
Replace database_cleaner with database_rewinder
biow0lf Apr 30, 2017
410dd78
Cleanup
biow0lf Apr 30, 2017
803e0b3
Update branch factory
biow0lf Apr 30, 2017
e7355e5
Update hashdiff gem to 0.3.4
biow0lf May 1, 2017
cc60637
Update pghero gem to 1.7.0
biow0lf May 1, 2017
f3654ae
Update bundler gem to 1.15.0.pre.3
biow0lf May 1, 2017
c142e59
Update capybara gem to 2.14.0
biow0lf May 2, 2017
7e1b376
Update turbolinks-source gem to 5.0.2
biow0lf May 4, 2017
dadaef9
Update mysql2 gem to 0.4.6
biow0lf May 4, 2017
ed4db4e
Update devise gem from upstream git
biow0lf May 4, 2017
e3ad150
Update awesome_nested_set gem from upstream git
biow0lf May 4, 2017
2e6d6fe
Update turbolinks-source gem to 5.0.3
biow0lf May 5, 2017
2d036a1
Update rspec gems to 3.6 branch
biow0lf May 5, 2017
1a2bf44
Add mry gem
biow0lf May 5, 2017
5837d7b
Update mry gem to 0.48.1.2
biow0lf May 5, 2017
59bb9f6
Update awesome_nested_set gem to 3.1.3
biow0lf May 5, 2017
ac73518
Update rails-i18n gem to 5.0.4
biow0lf May 8, 2017
38a0d71
Update rack-protection gem to 2.0.0
biow0lf May 8, 2017
698387c
Update devise gem from upstream git
biow0lf May 8, 2017
e3dc12b
Update rack gem to 2.0.2
biow0lf May 8, 2017
10a41cb
Update draper gem to 3.0.0
biow0lf May 8, 2017
cc37672
Cleanup
biow0lf May 8, 2017
b6537c0
Add bundler-audit gem
biow0lf May 9, 2017
28a9d20
Update minitest gem to 5.10.2
biow0lf May 10, 2017
479f2f2
Update nokogiri gem to 1.7.2
biow0lf May 10, 2017
0a7ceb2
Update bundler gem to 1.15.0.pre.4
biow0lf May 11, 2017
441520f
Update browser gem to 2.4.0
biow0lf May 11, 2017
eac4002
Update rails-dom-testing gem to 2.0.3
biow0lf May 11, 2017
fef6a59
Update devise gem from upstream git
biow0lf May 11, 2017
d09610a
Update devise gem from upstream git
biow0lf May 12, 2017
f39d03f
Update lograge gem to 0.5.1
biow0lf May 13, 2017
6ea788e
Update climate_control gem to 0.2.0
biow0lf May 13, 2017
1671196
Update rails gems to 5.1.1
biow0lf May 13, 2017
081b2de
Update devise gem from upstream git
biow0lf May 15, 2017
0f1683b
Update devise gem to 4.3.0
biow0lf May 15, 2017
33e4f0e
Update mry gem to 0.48.1.3
biow0lf May 15, 2017
29a7ebb
Update rubygems to 2.6.12
biow0lf May 15, 2017
b978bde
Update rack gem to 2.0.3
biow0lf May 15, 2017
a82c9dd
Update rails-controller-testing gem to 1.0.2
biow0lf May 17, 2017
1f3eb2a
Update rack-mini-profiler gem to 0.10.4
biow0lf May 17, 2017
f703d03
Update simplecov-html gem to 0.10.1
biow0lf May 17, 2017
9b925b7
Replace DatabaseCleaner with DatabaseRewinder
biow0lf May 18, 2017
872686a
Update ruby to 2.4.1 on travis
biow0lf May 18, 2017
ea7d25f
Update schema
biow0lf May 18, 2017
3b3c607
Update sass gem to 3.4.24
biow0lf May 19, 2017
e98b8f6
Update database_rewinder gem to 0.8.2
biow0lf May 19, 2017
3a40826
Update bundler gem to 1.15.0
biow0lf May 20, 2017
3f8774d
Update brakeman gem to 3.6.2
biow0lf May 20, 2017
6fb4e18
Update rack-mini-profiler gem to 0.10.5
biow0lf May 24, 2017
7cb422c
Update xpath gem to 2.1.0
biow0lf May 29, 2017
b94255a
Update newrelic_rpm gem to 4.2.0.334
biow0lf May 29, 2017
2a155c7
Update nio4r gem to 2.1.0
biow0lf May 29, 2017
a45ca22
Update rubocop gem to 0.49.0
biow0lf May 29, 2017
a808747
Update mry gem to 0.49.0.0
biow0lf May 29, 2017
5754efc
Update rubocop config
biow0lf May 29, 2017
f8eb6da
Update rubocop gem to 0.49.1
biow0lf May 29, 2017
5925ee0
Update i18n gem to 0.8.4
biow0lf Jun 1, 2017
4b7d557
Update bundler gem to 1.15.1
biow0lf Jun 2, 2017
526269c
Update puma gem to 3.9.0
biow0lf Jun 2, 2017
ac2e3b6
Update puma gem to 3.9.1
biow0lf Jun 5, 2017
1226d88
Update nokogiri gem to 1.8.0
biow0lf Jun 5, 2017
d2d201d
Update sidekiq gem to 5.0.2
biow0lf Jun 7, 2017
154fbba
Update capybara gem to 2.14.1
biow0lf Jun 8, 2017
eb91e74
Update rouge gem to 2.1.0
biow0lf Jun 8, 2017
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
4 changes: 4 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
PROMETHEUS2_DATABASE_POOL=""
PROMETHEUS2_DATABASE_NAME=""
PROMETHEUS2_DATABASE_USERNAME=""
PROMETHEUS2_DATABASE_PASSWORD=""
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ public/sitemap*.xml.gz
dump.rdb
db/sphinx/*
config/development.sphinx.conf
config/database.yml
config/initializers/secret_token.rb
config/initializers/devise.rb
coverage/
Expand Down
6 changes: 3 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Style/Documentation:
Enabled: false

# Recheck this cop later
Style/DotPosition:
Layout/DotPosition:
Description: 'Checks the position of the dot in multi-line method calls.'
StyleGuide: '#consistent-multi-line-chains'
Enabled: true
Expand Down Expand Up @@ -69,7 +69,7 @@ Style/SignalException:
Enabled: true

# Enable with EnforcedStyle is space
Style/SpaceInsideStringInterpolation:
Layout/SpaceInsideStringInterpolation:
EnforcedStyle: space
Enabled: true

Expand Down Expand Up @@ -113,7 +113,7 @@ Style/MethodCalledOnDoEndBlock:
Enabled: true

# Check for a newline after the assignment operator in multi-line assignments
Style/MultilineAssignmentLayout:
Layout/MultilineAssignmentLayout:
Enabled: true

# Just ignore order of gems in Gemfile
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
rvm:
- 2.4.0
- 2.4.1
env:
- DB=postgresql TRAVIS=true

Expand Down
22 changes: 11 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source 'https://rubygems.org'

gem 'rails', '~> 5.0.2'
gem 'rails', '~> 5.1.0'
gem 'pg', '~> 0.18'
gem 'puma', '~> 3.0'
gem 'puma', '~> 3.7'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'jquery-rails'
Expand All @@ -18,9 +18,10 @@ gem 'dotenv-rails'
gem 'redis-objects'
gem 'pghero'
gem 'pg_query'
gem 'bundler-audit'

gem 'devise'
gem 'draper', '~> 3.0.0.pre1'
gem 'draper'
gem 'fast_gettext'
gem 'gettext_i18n_rails'
gem 'gettext', require: false
Expand All @@ -36,7 +37,7 @@ gem 'swagger-blocks'
gem 'rack-cors', require: 'rack/cors'
gem 'sidekiq'
# gem 'oink'
gem 'rectify'
# gem 'rectify' TODO: remove this gem
gem 'cocaine'
gem 'browser'
gem 'http_accept_language'
Expand All @@ -53,7 +54,7 @@ group :production do
end

group :development do
gem 'listen', '~> 3.0.5'
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'bullet'
# https://github.com/net-ssh/net-ssh/issues/478
gem 'bcrypt_pbkdf' # for rbnacl-libsodium
Expand All @@ -67,13 +68,14 @@ group :development do
gem 'capistrano3-puma'
# gem 'xray-rails'
# rubocop version locked due config. Update rubocop config on gem update.
gem 'rubocop', '0.48.1', require: false # DONE
gem 'rubocop', '0.49.1', require: false
gem 'mry'
gem 'brakeman', require: false
# gem 'lol_dba'
end

group :development, :test do
gem 'rspec-rails' # DONE
gem 'rspec-rails'
gem 'pry-rails'
gem 'awesome_print', require: 'ap'
gem 'faker'
Expand All @@ -90,10 +92,8 @@ group :test do
gem 'capybara'
gem 'capybara-email'
gem 'launchy'
gem 'database_cleaner'
gem 'fakeweb'
# TODO: replace fakeweb with webmock
gem 'webmock', require: false
gem 'database_rewinder'
gem 'webmock'
gem 'fakeredis'
gem 'simplecov', require: false
gem 'codeclimate-test-reporter', require: false
Expand Down
Loading