Merge branch 'master' into production
This commit is contained in:
commit
69c02fae9e
@ -1 +1 @@
|
|||||||
2.4.1
|
2.4.3
|
||||||
|
|||||||
14
Gemfile
14
Gemfile
@ -1,8 +1,8 @@
|
|||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '5.0.2'
|
gem 'rails', '5.0.6'
|
||||||
gem 'sqlite3'
|
gem 'sqlite3'
|
||||||
gem 'pg', '~> 0.20.0'
|
gem 'pg', '~> 0.21.0'
|
||||||
gem 'sass-rails', '~> 5.0'
|
gem 'sass-rails', '~> 5.0'
|
||||||
gem 'uglifier', '>= 1.3.0'
|
gem 'uglifier', '>= 1.3.0'
|
||||||
|
|
||||||
@ -14,11 +14,11 @@ gem 'therubyracer', platforms: :ruby
|
|||||||
# Use jquery as the JavaScript library
|
# Use jquery as the JavaScript library
|
||||||
gem 'jquery-rails', '~> 4.3.1'
|
gem 'jquery-rails', '~> 4.3.1'
|
||||||
gem 'bootstrap-sass', '~> 3.3.7'
|
gem 'bootstrap-sass', '~> 3.3.7'
|
||||||
gem 'kaminari', '~> 1.0.1'
|
gem 'kaminari', '~> 1.1.1'
|
||||||
gem 'turbolinks', '~> 5.0.1'
|
gem 'turbolinks', '~> 5.1.0'
|
||||||
gem 'jbuilder', '~> 2.6'
|
gem 'jbuilder', '~> 2.7'
|
||||||
gem 'cocoon', '~> 1.2.9'
|
gem 'cocoon', '~> 1.2.9'
|
||||||
gem 'unitwise', '~> 2.0.0'
|
gem 'unitwise', '~> 2.2.0'
|
||||||
gem 'redcarpet', '~> 3.4.0'
|
gem 'redcarpet', '~> 3.4.0'
|
||||||
|
|
||||||
# Use ActiveModel has_secure_password
|
# Use ActiveModel has_secure_password
|
||||||
@ -35,5 +35,3 @@ group :development, :test do
|
|||||||
gem 'database_cleaner', '~> 1.5.3'
|
gem 'database_cleaner', '~> 1.5.3'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
215
Gemfile.lock
215
Gemfile.lock
@ -1,71 +1,72 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (5.0.2)
|
actioncable (5.0.6)
|
||||||
actionpack (= 5.0.2)
|
actionpack (= 5.0.6)
|
||||||
nio4r (>= 1.2, < 3.0)
|
nio4r (>= 1.2, < 3.0)
|
||||||
websocket-driver (~> 0.6.1)
|
websocket-driver (~> 0.6.1)
|
||||||
actionmailer (5.0.2)
|
actionmailer (5.0.6)
|
||||||
actionpack (= 5.0.2)
|
actionpack (= 5.0.6)
|
||||||
actionview (= 5.0.2)
|
actionview (= 5.0.6)
|
||||||
activejob (= 5.0.2)
|
activejob (= 5.0.6)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (5.0.2)
|
actionpack (5.0.6)
|
||||||
actionview (= 5.0.2)
|
actionview (= 5.0.6)
|
||||||
activesupport (= 5.0.2)
|
activesupport (= 5.0.6)
|
||||||
rack (~> 2.0)
|
rack (~> 2.0)
|
||||||
rack-test (~> 0.6.3)
|
rack-test (~> 0.6.3)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (5.0.2)
|
actionview (5.0.6)
|
||||||
activesupport (= 5.0.2)
|
activesupport (= 5.0.6)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||||
activejob (5.0.2)
|
activejob (5.0.6)
|
||||||
activesupport (= 5.0.2)
|
activesupport (= 5.0.6)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (5.0.2)
|
activemodel (5.0.6)
|
||||||
activesupport (= 5.0.2)
|
activesupport (= 5.0.6)
|
||||||
activerecord (5.0.2)
|
activerecord (5.0.6)
|
||||||
activemodel (= 5.0.2)
|
activemodel (= 5.0.6)
|
||||||
activesupport (= 5.0.2)
|
activesupport (= 5.0.6)
|
||||||
arel (~> 7.0)
|
arel (~> 7.0)
|
||||||
activesupport (5.0.2)
|
activesupport (5.0.6)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
arel (7.1.4)
|
arel (7.1.4)
|
||||||
autoprefixer-rails (6.7.7.1)
|
autoprefixer-rails (8.1.0.1)
|
||||||
execjs
|
execjs
|
||||||
bcrypt (3.1.11)
|
bcrypt (3.1.11)
|
||||||
bootstrap-sass (3.3.7)
|
bootstrap-sass (3.3.7)
|
||||||
autoprefixer-rails (>= 5.2.1)
|
autoprefixer-rails (>= 5.2.1)
|
||||||
sass (>= 3.3.4)
|
sass (>= 3.3.4)
|
||||||
builder (3.2.3)
|
builder (3.2.3)
|
||||||
cocoon (1.2.9)
|
cocoon (1.2.11)
|
||||||
coderay (1.1.1)
|
coderay (1.1.2)
|
||||||
concurrent-ruby (1.0.5)
|
concurrent-ruby (1.0.5)
|
||||||
|
crass (1.0.3)
|
||||||
database_cleaner (1.5.3)
|
database_cleaner (1.5.3)
|
||||||
diff-lcs (1.3)
|
diff-lcs (1.3)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (2.7.0)
|
execjs (2.7.0)
|
||||||
factory_girl (4.8.0)
|
factory_girl (4.8.1)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
factory_girl_rails (4.8.0)
|
factory_girl_rails (4.8.0)
|
||||||
factory_girl (~> 4.8.0)
|
factory_girl (~> 4.8.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
ffi (1.9.18)
|
ffi (1.9.23)
|
||||||
formatador (0.2.5)
|
formatador (0.2.5)
|
||||||
globalid (0.3.7)
|
globalid (0.4.1)
|
||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.2.0)
|
||||||
guard (2.14.1)
|
guard (2.14.2)
|
||||||
formatador (>= 0.2.4)
|
formatador (>= 0.2.4)
|
||||||
listen (>= 2.7, < 4.0)
|
listen (>= 2.7, < 4.0)
|
||||||
lumberjack (~> 1.0)
|
lumberjack (>= 1.0.12, < 2.0)
|
||||||
nenv (~> 0.1)
|
nenv (~> 0.1)
|
||||||
notiffany (~> 0.0)
|
notiffany (~> 0.0)
|
||||||
pry (>= 0.9.12)
|
pry (>= 0.9.12)
|
||||||
@ -76,94 +77,93 @@ GEM
|
|||||||
guard (~> 2.1)
|
guard (~> 2.1)
|
||||||
guard-compat (~> 1.1)
|
guard-compat (~> 1.1)
|
||||||
rspec (>= 2.99.0, < 4.0)
|
rspec (>= 2.99.0, < 4.0)
|
||||||
i18n (0.8.1)
|
i18n (0.9.5)
|
||||||
jbuilder (2.6.3)
|
concurrent-ruby (~> 1.0)
|
||||||
activesupport (>= 3.0.0, < 5.2)
|
jbuilder (2.7.0)
|
||||||
multi_json (~> 1.2)
|
activesupport (>= 4.2.0)
|
||||||
|
multi_json (>= 1.2)
|
||||||
jquery-rails (4.3.1)
|
jquery-rails (4.3.1)
|
||||||
rails-dom-testing (>= 1, < 3)
|
rails-dom-testing (>= 1, < 3)
|
||||||
railties (>= 4.2.0)
|
railties (>= 4.2.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
kaminari (1.0.1)
|
kaminari (1.1.1)
|
||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.1.0)
|
||||||
kaminari-actionview (= 1.0.1)
|
kaminari-actionview (= 1.1.1)
|
||||||
kaminari-activerecord (= 1.0.1)
|
kaminari-activerecord (= 1.1.1)
|
||||||
kaminari-core (= 1.0.1)
|
kaminari-core (= 1.1.1)
|
||||||
kaminari-actionview (1.0.1)
|
kaminari-actionview (1.1.1)
|
||||||
actionview
|
actionview
|
||||||
kaminari-core (= 1.0.1)
|
kaminari-core (= 1.1.1)
|
||||||
kaminari-activerecord (1.0.1)
|
kaminari-activerecord (1.1.1)
|
||||||
activerecord
|
activerecord
|
||||||
kaminari-core (= 1.0.1)
|
kaminari-core (= 1.1.1)
|
||||||
kaminari-core (1.0.1)
|
kaminari-core (1.1.1)
|
||||||
libv8 (3.16.14.19)
|
libv8 (3.16.14.19)
|
||||||
liner (0.2.4)
|
liner (0.2.4)
|
||||||
listen (3.1.5)
|
listen (3.1.5)
|
||||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||||
rb-inotify (~> 0.9, >= 0.9.7)
|
rb-inotify (~> 0.9, >= 0.9.7)
|
||||||
ruby_dep (~> 1.2)
|
ruby_dep (~> 1.2)
|
||||||
loofah (2.0.3)
|
loofah (2.2.1)
|
||||||
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
lumberjack (1.0.11)
|
lumberjack (1.0.12)
|
||||||
mail (2.6.4)
|
mail (2.7.0)
|
||||||
mime-types (>= 1.16, < 4)
|
mini_mime (>= 0.1.1)
|
||||||
memoizable (0.4.2)
|
memoizable (0.4.2)
|
||||||
thread_safe (~> 0.3, >= 0.3.1)
|
thread_safe (~> 0.3, >= 0.3.1)
|
||||||
method_source (0.8.2)
|
method_source (0.9.0)
|
||||||
mime-types (3.1)
|
mini_mime (1.0.0)
|
||||||
mime-types-data (~> 3.2015)
|
mini_portile2 (2.3.0)
|
||||||
mime-types-data (3.2016.0521)
|
minitest (5.11.3)
|
||||||
mini_portile2 (2.1.0)
|
multi_json (1.13.1)
|
||||||
minitest (5.10.1)
|
|
||||||
multi_json (1.12.1)
|
|
||||||
nenv (0.3.0)
|
nenv (0.3.0)
|
||||||
nio4r (2.0.0)
|
nio4r (2.3.0)
|
||||||
nokogiri (1.7.1)
|
nokogiri (1.8.2)
|
||||||
mini_portile2 (~> 2.1.0)
|
mini_portile2 (~> 2.3.0)
|
||||||
notiffany (0.1.1)
|
notiffany (0.1.1)
|
||||||
nenv (~> 0.1)
|
nenv (~> 0.1)
|
||||||
shellany (~> 0.0)
|
shellany (~> 0.0)
|
||||||
parslet (1.8.0)
|
parslet (1.8.2)
|
||||||
pg (0.20.0)
|
pg (0.21.0)
|
||||||
pry (0.10.4)
|
pry (0.11.3)
|
||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
method_source (~> 0.8.1)
|
method_source (~> 0.9.0)
|
||||||
slop (~> 3.4)
|
puma (3.11.3)
|
||||||
puma (3.8.2)
|
rack (2.0.4)
|
||||||
rack (2.0.1)
|
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (5.0.2)
|
rails (5.0.6)
|
||||||
actioncable (= 5.0.2)
|
actioncable (= 5.0.6)
|
||||||
actionmailer (= 5.0.2)
|
actionmailer (= 5.0.6)
|
||||||
actionpack (= 5.0.2)
|
actionpack (= 5.0.6)
|
||||||
actionview (= 5.0.2)
|
actionview (= 5.0.6)
|
||||||
activejob (= 5.0.2)
|
activejob (= 5.0.6)
|
||||||
activemodel (= 5.0.2)
|
activemodel (= 5.0.6)
|
||||||
activerecord (= 5.0.2)
|
activerecord (= 5.0.6)
|
||||||
activesupport (= 5.0.2)
|
activesupport (= 5.0.6)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0)
|
||||||
railties (= 5.0.2)
|
railties (= 5.0.6)
|
||||||
sprockets-rails (>= 2.0.0)
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-controller-testing (1.0.1)
|
rails-controller-testing (1.0.2)
|
||||||
actionpack (~> 5.x)
|
actionpack (~> 5.x, >= 5.0.1)
|
||||||
actionview (~> 5.x)
|
actionview (~> 5.x, >= 5.0.1)
|
||||||
activesupport (~> 5.x)
|
activesupport (~> 5.x)
|
||||||
rails-dom-testing (2.0.2)
|
rails-dom-testing (2.0.3)
|
||||||
activesupport (>= 4.2.0, < 6.0)
|
activesupport (>= 4.2.0)
|
||||||
nokogiri (~> 1.6)
|
nokogiri (>= 1.6)
|
||||||
rails-html-sanitizer (1.0.3)
|
rails-html-sanitizer (1.0.3)
|
||||||
loofah (~> 2.0)
|
loofah (~> 2.0)
|
||||||
railties (5.0.2)
|
railties (5.0.6)
|
||||||
actionpack (= 5.0.2)
|
actionpack (= 5.0.6)
|
||||||
activesupport (= 5.0.2)
|
activesupport (= 5.0.6)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (12.0.0)
|
rake (12.3.0)
|
||||||
rb-fsevent (0.9.8)
|
rb-fsevent (0.10.3)
|
||||||
rb-inotify (0.9.8)
|
rb-inotify (0.9.10)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0, < 2)
|
||||||
redcarpet (3.4.0)
|
redcarpet (3.4.0)
|
||||||
ref (2.0.0)
|
ref (2.0.0)
|
||||||
rspec (3.5.0)
|
rspec (3.5.0)
|
||||||
@ -188,8 +188,12 @@ GEM
|
|||||||
rspec-support (~> 3.5.0)
|
rspec-support (~> 3.5.0)
|
||||||
rspec-support (3.5.0)
|
rspec-support (3.5.0)
|
||||||
ruby_dep (1.5.0)
|
ruby_dep (1.5.0)
|
||||||
sass (3.4.23)
|
sass (3.5.5)
|
||||||
sass-rails (5.0.6)
|
sass-listen (~> 4.0.0)
|
||||||
|
sass-listen (4.0.0)
|
||||||
|
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||||
|
rb-inotify (~> 0.9, >= 0.9.7)
|
||||||
|
sass-rails (5.0.7)
|
||||||
railties (>= 4.0.0, < 6)
|
railties (>= 4.0.0, < 6)
|
||||||
sass (~> 3.1)
|
sass (~> 3.1)
|
||||||
sprockets (>= 2.8, < 4.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
@ -197,11 +201,10 @@ GEM
|
|||||||
tilt (>= 1.1, < 3)
|
tilt (>= 1.1, < 3)
|
||||||
shellany (0.0.1)
|
shellany (0.0.1)
|
||||||
signed_multiset (0.2.1)
|
signed_multiset (0.2.1)
|
||||||
slop (3.6.0)
|
|
||||||
sprockets (3.7.1)
|
sprockets (3.7.1)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
rack (> 1, < 3)
|
rack (> 1, < 3)
|
||||||
sprockets-rails (3.2.0)
|
sprockets-rails (3.2.1)
|
||||||
actionpack (>= 4.0)
|
actionpack (>= 4.0)
|
||||||
activesupport (>= 4.0)
|
activesupport (>= 4.0)
|
||||||
sprockets (>= 3.0.0)
|
sprockets (>= 3.0.0)
|
||||||
@ -209,24 +212,24 @@ GEM
|
|||||||
therubyracer (0.12.3)
|
therubyracer (0.12.3)
|
||||||
libv8 (~> 3.16.14.15)
|
libv8 (~> 3.16.14.15)
|
||||||
ref
|
ref
|
||||||
thor (0.19.4)
|
thor (0.20.0)
|
||||||
thread_safe (0.3.6)
|
thread_safe (0.3.6)
|
||||||
tilt (2.0.7)
|
tilt (2.0.8)
|
||||||
turbolinks (5.0.1)
|
turbolinks (5.1.0)
|
||||||
turbolinks-source (~> 5)
|
turbolinks-source (~> 5.1)
|
||||||
turbolinks-source (5.0.0)
|
turbolinks-source (5.1.0)
|
||||||
tzinfo (1.2.3)
|
tzinfo (1.2.5)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (3.2.0)
|
uglifier (4.1.8)
|
||||||
execjs (>= 0.3.0, < 3)
|
execjs (>= 0.3.0, < 3)
|
||||||
unitwise (2.0.0)
|
unitwise (2.2.0)
|
||||||
liner (~> 0.2)
|
liner (~> 0.2)
|
||||||
memoizable (~> 0.4)
|
memoizable (~> 0.4)
|
||||||
parslet (~> 1.5)
|
parslet (~> 1.5)
|
||||||
signed_multiset (~> 0.2)
|
signed_multiset (~> 0.2)
|
||||||
websocket-driver (0.6.5)
|
websocket-driver (0.6.5)
|
||||||
websocket-extensions (>= 0.1.0)
|
websocket-extensions (>= 0.1.0)
|
||||||
websocket-extensions (0.1.2)
|
websocket-extensions (0.1.3)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
@ -239,21 +242,21 @@ DEPENDENCIES
|
|||||||
factory_girl_rails (~> 4.8.0)
|
factory_girl_rails (~> 4.8.0)
|
||||||
guard (~> 2.14.0)
|
guard (~> 2.14.0)
|
||||||
guard-rspec
|
guard-rspec
|
||||||
jbuilder (~> 2.6)
|
jbuilder (~> 2.7)
|
||||||
jquery-rails (~> 4.3.1)
|
jquery-rails (~> 4.3.1)
|
||||||
kaminari (~> 1.0.1)
|
kaminari (~> 1.1.1)
|
||||||
pg (~> 0.20.0)
|
pg (~> 0.21.0)
|
||||||
puma
|
puma
|
||||||
rails (= 5.0.2)
|
rails (= 5.0.6)
|
||||||
rails-controller-testing
|
rails-controller-testing
|
||||||
redcarpet (~> 3.4.0)
|
redcarpet (~> 3.4.0)
|
||||||
rspec-rails (~> 3.5.0)
|
rspec-rails (~> 3.5.0)
|
||||||
sass-rails (~> 5.0)
|
sass-rails (~> 5.0)
|
||||||
sqlite3
|
sqlite3
|
||||||
therubyracer
|
therubyracer
|
||||||
turbolinks (~> 5.0.1)
|
turbolinks (~> 5.1.0)
|
||||||
uglifier (>= 1.3.0)
|
uglifier (>= 1.3.0)
|
||||||
unitwise (~> 2.0.0)
|
unitwise (~> 2.2.0)
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.14.6
|
1.16.1
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user