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.

Sign up for GitHub

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

Jump to bottom

Add support for Ruby 2.4.1 #1182

Merged
merged 1 commit into from Mar 28, 2017
Merged

Add support for Ruby 2.4.1 #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@ rvm:
- 2.1
- 2.2.6
- 2.3.3
- 2.4.1
- ruby-head
- jruby-head
env:
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
View file
Open in desktop
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

RAILS_VERSION = '~> 4.2.5.2'
RAILS_VERSION = '~> 4.2.8'

send :ruby, ENV['GEMFILE_RUBY_VERSION'] if ENV['GEMFILE_RUBY_VERSION']

Expand Down Expand Up @@ -80,8 +80,8 @@ group :development do
end

group :test do
gem 'rspec', '~> 3.3'
gem 'rspec-rails', '~> 3.0', require: false
gem 'rspec', '~> 3.5'
gem 'rspec-rails', '~> 3.5', require: false
gem 'rspec-activemodel-mocks'
gem 'rspec-its'
gem 'mongoid-rspec', '~> 3.0.0', require: false
Expand Down
173 changes: 86 additions & 87 deletions Gemfile.lock
View file
Open in desktop
@@ -1,50 +1,49 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
actionmailer (4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionmailer_inline_css (1.5.3)
actionmailer (>= 3.0.0)
nokogiri (>= 1.4.4)
premailer (>= 1.7.1)
actionpack (4.2.5.2)
actionview (= 4.2.5.2)
activesupport (= 4.2.5.2)
actionpack (4.2.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.5.2)
activesupport (= 4.2.5.2)
actionview (4.2.8)
activesupport (= 4.2.8)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.5.2)
activesupport (= 4.2.5.2)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.8)
activesupport (= 4.2.8)
globalid (>= 0.3.0)
activemodel (4.2.5.2)
activesupport (= 4.2.5.2)
activemodel (4.2.8)
activesupport (= 4.2.8)
builder (~> 3.1)
activerecord (4.2.5.2)
activemodel (= 4.2.5.2)
activesupport (= 4.2.5.2)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
arel (~> 6.0)
activesupport (4.2.5.2)
activesupport (4.2.8)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
airbrake (4.3.5)
builder
multi_json
arel (6.0.3)
arel (6.0.4)
ast (2.1.0)
astrolabe (1.3.1)
parser (~> 2.2)
Expand Down Expand Up @@ -89,8 +88,8 @@ GEM
coderay (1.1.0)
colorize (0.7.7)
columnize (0.9.0)
concurrent-ruby (1.0.1)
concurrent-ruby (1.0.1-java)
concurrent-ruby (1.0.5)
concurrent-ruby (1.0.5-java)
coveralls (0.8.2)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
Expand All @@ -109,7 +108,7 @@ GEM
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.2.5)
diff-lcs (1.3)
docile (1.1.5)
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
Expand Down Expand Up @@ -141,7 +140,7 @@ GEM
multi_json
font-awesome-rails (4.2.0.0)
railties (>= 3.2, < 5.0)
globalid (0.3.6)
globalid (0.3.7)
activesupport (>= 4.1.0)
haml (4.0.7)
tilt
Expand Down Expand Up @@ -176,19 +175,19 @@ GEM
launchy (2.4.3-java)
addressable (~> 2.3)
spoon (~> 0.0.1)
libv8 (3.16.14.15)
libv8 (3.16.14.19)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mail (2.6.4)
mime-types (>= 1.16, < 4)
meta_request (0.3.4)
callsite (~> 0.0, >= 0.0.11)
rack-contrib (~> 1.1)
railties (>= 3.0.0, < 5.0.0)
method_source (0.8.2)
mime-types (2.99.1)
mime-types (2.99.3)
mimemagic (0.3.0)
mini_portile2 (2.0.0)
mini_portile2 (2.1.0)
minitest (5.10.1)
mongo (2.4.1)
bson (>= 4.2.1, < 5.0.0)
Expand All @@ -213,9 +212,9 @@ GEM
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
netrc (0.10.3)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.6.7.2-java)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
nokogiri (1.7.1-java)
oauth2 (1.0.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
Expand Down Expand Up @@ -269,34 +268,34 @@ GEM
pry (~> 0.10)
pry-rails (0.3.4)
pry (>= 0.9.10)
puma (3.4.0)
puma (3.4.0-java)
puma (3.8.2)
puma (3.8.2-java)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.4)
rack (1.6.5)
rack-contrib (1.2.0)
rack (>= 0.9.1)
rack-ssl (1.4.1)
rack
rack-ssl-enforcer (0.2.8)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.5.2)
actionmailer (= 4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
activemodel (= 4.2.5.2)
activerecord (= 4.2.5.2)
activesupport (= 4.2.5.2)
rails (4.2.8)
actionmailer (= 4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
activemodel (= 4.2.8)
activerecord (= 4.2.8)
activesupport (= 4.2.8)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5.2)
railties (= 4.2.8)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
Expand All @@ -307,14 +306,14 @@ GEM
rails (> 3.1)
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.3)
railties (4.2.5.2)
actionpack (= 4.2.5.2)
activesupport (= 4.2.5.2)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
rake (10.5.0)
ref (1.0.5)
rake (12.0.0)
ref (2.0.0)
request_store (1.1.0)
responders (2.1.1)
railties (>= 4.2.0, < 5.1)
Expand All @@ -323,34 +322,34 @@ GEM
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
ri_cal (0.8.8)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-activemodel-mocks (1.0.1)
activemodel (>= 3.0)
activesupport (>= 3.0)
rspec-mocks (>= 2.99, < 4.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-support (~> 3.5.0)
rspec-its (1.2.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.3.2)
rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-rails (3.3.2)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rspec-support (~> 3.5.0)
rspec-rails (3.5.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
rubocop (0.34.2)
astrolabe (~> 1.3)
parser (>= 2.2.2.5, < 3.0)
Expand All @@ -361,13 +360,13 @@ GEM
rushover (0.3.0)
json
rest-client
sass (3.4.15)
sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0)
sass (3.4.23)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
tilt (>= 1.1, < 3)
sawyer (0.7.0)
addressable (>= 2.3.5, < 2.5)
faraday (~> 0.8, < 0.10)
Expand All @@ -379,10 +378,10 @@ GEM
slop (3.6.0)
spoon (0.0.4)
ffi
sprockets (3.5.2)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.3)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
Expand All @@ -394,13 +393,13 @@ GEM
concurrent-ruby (~> 1.0.0)
term-ansicolor (1.3.2)
tins (~> 1.0)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (0.19.1)
thor (0.19.4)
thread_safe (0.3.6)
thread_safe (0.3.6-java)
tilt (1.4.1)
tilt (2.0.7)
timecop (0.7.4)
tins (1.6.0)
tzinfo (1.2.2)
Expand All @@ -424,16 +423,16 @@ GEM
xmpp4r (0.5.6)
xpath (2.0.0)
nokogiri (~> 1.3)
yajl-ruby (1.2.1)
yajl-ruby (1.3.0)

PLATFORMS
java
ruby

DEPENDENCIES
actionmailer (~> 4.2.5.2)
actionmailer (~> 4.2.8)
actionmailer_inline_css
actionpack (~> 4.2.5.2)
actionpack (~> 4.2.8)
airbrake (~> 4.3.5)
better_errors
binding_of_caller
Expand Down Expand Up @@ -482,12 +481,12 @@ DEPENDENCIES
rack-ssl-enforcer
rails_12factor
rails_autolink
railties (~> 4.2.5.2)
railties (~> 4.2.8)
ri_cal
rspec (~> 3.3)
rspec (~> 3.5)
rspec-activemodel-mocks
rspec-its
rspec-rails (~> 3.0)
rspec-rails (~> 3.5)
rubocop
rushover
sass-rails
Expand All @@ -501,4 +500,4 @@ DEPENDENCIES
yajl-ruby

BUNDLED WITH
1.14.5
1.14.6
2 changes: 1 addition & 1 deletion app/models/user.rb
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ class User
field :google_uid
field :name
field :admin, type: Boolean, default: false
field :per_page, type: Fixnum, default: PER_PAGE
field :per_page, type: Integer, default: PER_PAGE
field :time_zone, default: "UTC"

## Devise field
Expand Down