mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-12-26 17:51:13 +08:00
Update Rails version to 4.2.10 [SCI-1845]
This commit is contained in:
Oleksii Kriuchykhin
parent
92b665253f
commit
9408b29768
2 changed files with 67 additions and 65 deletions
4
Gemfile
4
Gemfile
|
|
@ -2,7 +2,7 @@ source 'http://rubygems.org'
|
|||
|
||||
ruby '2.3.3'
|
||||
|
||||
gem 'rails', '4.2.5'
|
||||
gem 'rails', '4.2.10'
|
||||
gem 'figaro'
|
||||
gem 'pg'
|
||||
gem 'devise', '3.5.6'
|
||||
|
|
@ -45,7 +45,7 @@ gem 'nested_form_fields'
|
|||
gem 'ajax-datatables-rails', '~> 0.3.1'
|
||||
gem 'commit_param_routing' # Enables different submit actions in the same form to route to different actions in controller
|
||||
gem 'kaminari'
|
||||
gem "i18n-js", ">= 3.0.0.rc11" # Localization in javascript files
|
||||
gem 'i18n-js', '~> 3.0' # Localization in javascript files
|
||||
gem 'roo', '~> 2.7.1' # Spreadsheet parser
|
||||
gem 'creek'
|
||||
gem 'wicked_pdf'
|
||||
|
|
|
|||
128
Gemfile.lock
128
Gemfile.lock
|
|
@ -17,40 +17,39 @@ GIT
|
|||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.2.5)
|
||||
actionpack (= 4.2.5)
|
||||
actionview (= 4.2.5)
|
||||
activejob (= 4.2.5)
|
||||
actionmailer (4.2.10)
|
||||
actionpack (= 4.2.10)
|
||||
actionview (= 4.2.10)
|
||||
activejob (= 4.2.10)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
actionpack (4.2.5)
|
||||
actionview (= 4.2.5)
|
||||
activesupport (= 4.2.5)
|
||||
actionpack (4.2.10)
|
||||
actionview (= 4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
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)
|
||||
activesupport (= 4.2.5)
|
||||
actionview (4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
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)
|
||||
activesupport (= 4.2.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
activejob (4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.5)
|
||||
activesupport (= 4.2.5)
|
||||
activemodel (4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.5)
|
||||
activemodel (= 4.2.5)
|
||||
activesupport (= 4.2.5)
|
||||
activerecord (4.2.10)
|
||||
activemodel (= 4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
arel (~> 6.0)
|
||||
activerecord-import (0.19.0)
|
||||
activerecord (>= 3.2)
|
||||
activesupport (4.2.5)
|
||||
activesupport (4.2.10)
|
||||
i18n (~> 0.7)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
|
|
@ -58,7 +57,7 @@ GEM
|
|||
railties (>= 3.1)
|
||||
algorithms (0.6.1)
|
||||
ansi (1.5.0)
|
||||
arel (6.0.3)
|
||||
arel (6.0.4)
|
||||
aspector (0.14.0)
|
||||
ast (2.3.0)
|
||||
auto_strip_attributes (2.1.0)
|
||||
|
|
@ -99,7 +98,7 @@ GEM
|
|||
bootstrap3-datetimepicker-rails (4.15.35)
|
||||
momentjs-rails (>= 2.8.1)
|
||||
bootstrap_form (2.3.0)
|
||||
builder (3.2.2)
|
||||
builder (3.2.3)
|
||||
byebug (8.2.1)
|
||||
climate_control (0.0.3)
|
||||
activesupport (>= 3.0)
|
||||
|
|
@ -115,8 +114,8 @@ GEM
|
|||
coffee-script-source (1.10.0)
|
||||
colorize (0.8.1)
|
||||
commit_param_routing (0.0.1)
|
||||
concurrent-ruby (1.0.0)
|
||||
crass (1.0.2)
|
||||
concurrent-ruby (1.0.5)
|
||||
crass (1.0.3)
|
||||
creek (1.1.2)
|
||||
nokogiri (~> 1.6.0)
|
||||
rubyzip (>= 1.0.0)
|
||||
|
|
@ -151,12 +150,13 @@ GEM
|
|||
thor (~> 0.14)
|
||||
font-awesome-rails (4.6.3.1)
|
||||
railties (>= 3.2, < 5.1)
|
||||
globalid (0.3.6)
|
||||
activesupport (>= 4.1.0)
|
||||
globalid (0.4.1)
|
||||
activesupport (>= 4.2.0)
|
||||
hammerjs-rails (2.0.4)
|
||||
i18n (0.7.0)
|
||||
i18n-js (3.0.0.rc11)
|
||||
i18n (~> 0.6)
|
||||
i18n (0.9.1)
|
||||
concurrent-ruby (~> 1.0)
|
||||
i18n-js (3.0.2)
|
||||
i18n (~> 0.6, >= 0.6.6)
|
||||
introjs-rails (1.0.0)
|
||||
sass-rails (>= 3.2)
|
||||
thor (~> 0.14)
|
||||
|
|
@ -174,7 +174,7 @@ GEM
|
|||
railties (>= 3.2.16)
|
||||
js_cookie_rails (1.0.1)
|
||||
railties (>= 3.1)
|
||||
json (1.8.3)
|
||||
json (1.8.6)
|
||||
kaminari (0.16.3)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
|
|
@ -182,14 +182,16 @@ GEM
|
|||
logging (2.0.0)
|
||||
little-plugger (~> 1.1)
|
||||
multi_json (~> 1.10)
|
||||
loofah (2.0.3)
|
||||
loofah (2.1.1)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
mail (2.7.0)
|
||||
mini_mime (>= 0.1.1)
|
||||
mime-types (1.25.1)
|
||||
mimemagic (0.3.0)
|
||||
mini_mime (1.0.0)
|
||||
mini_portile2 (2.1.0)
|
||||
minitest (5.9.0)
|
||||
minitest (5.10.3)
|
||||
minitest-reporters (1.1.10)
|
||||
ansi
|
||||
builder
|
||||
|
|
@ -221,25 +223,25 @@ GEM
|
|||
polyglot (0.3.5)
|
||||
powerpack (0.1.1)
|
||||
puma (2.15.3)
|
||||
rack (1.6.4)
|
||||
rack (1.6.8)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.2.5)
|
||||
actionmailer (= 4.2.5)
|
||||
actionpack (= 4.2.5)
|
||||
actionview (= 4.2.5)
|
||||
activejob (= 4.2.5)
|
||||
activemodel (= 4.2.5)
|
||||
activerecord (= 4.2.5)
|
||||
activesupport (= 4.2.5)
|
||||
rails (4.2.10)
|
||||
actionmailer (= 4.2.10)
|
||||
actionpack (= 4.2.10)
|
||||
actionview (= 4.2.10)
|
||||
activejob (= 4.2.10)
|
||||
activemodel (= 4.2.10)
|
||||
activerecord (= 4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.5)
|
||||
railties (= 4.2.10)
|
||||
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)
|
||||
|
|
@ -250,14 +252,14 @@ GEM
|
|||
rails (> 3.1)
|
||||
rails_serve_static_assets (0.0.4)
|
||||
rails_stdout_logging (0.0.4)
|
||||
railties (4.2.5)
|
||||
actionpack (= 4.2.5)
|
||||
activesupport (= 4.2.5)
|
||||
railties (4.2.10)
|
||||
actionpack (= 4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (2.2.2)
|
||||
rake
|
||||
rake (12.0.0)
|
||||
rake (12.3.0)
|
||||
rdoc (4.2.0)
|
||||
recaptcha (4.0.0)
|
||||
json
|
||||
|
|
@ -284,9 +286,9 @@ GEM
|
|||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.4.4)
|
||||
nokogumbo (~> 1.4.1)
|
||||
sass (3.4.23)
|
||||
sass-rails (5.0.4)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (3.4.25)
|
||||
sass-rails (5.0.7)
|
||||
railties (>= 4.0.0, < 6)
|
||||
sass (~> 3.1)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
|
|
@ -308,13 +310,13 @@ GEM
|
|||
sourcemap (0.1.1)
|
||||
spinjs-rails (1.4)
|
||||
rails (>= 3.1)
|
||||
sprockets (3.5.2)
|
||||
sprockets (3.7.1)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-rails (2.3.3)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (3.2.1)
|
||||
actionpack (>= 4.0)
|
||||
activesupport (>= 4.0)
|
||||
sprockets (>= 3.0.0)
|
||||
starscope (1.5.3)
|
||||
babel-transpiler (~> 0.7)
|
||||
oj (~> 2.9)
|
||||
|
|
@ -323,14 +325,14 @@ GEM
|
|||
ruby-progressbar (~> 1.5)
|
||||
sourcemap (~> 0.1)
|
||||
stream (0.5)
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.5)
|
||||
tilt (2.0.1)
|
||||
thor (0.20.0)
|
||||
thread_safe (0.3.6)
|
||||
tilt (2.0.8)
|
||||
tinymce-rails (4.5.7)
|
||||
railties (>= 3.1.1)
|
||||
turbolinks (2.5.3)
|
||||
coffee-rails
|
||||
tzinfo (1.2.2)
|
||||
tzinfo (1.2.4)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.7.2)
|
||||
execjs (>= 0.3.0)
|
||||
|
|
@ -379,7 +381,7 @@ DEPENDENCIES
|
|||
figaro
|
||||
font-awesome-rails (~> 4.6)
|
||||
hammerjs-rails
|
||||
i18n-js (>= 3.0.0.rc11)
|
||||
i18n-js (~> 3.0)
|
||||
introjs-rails
|
||||
jquery-rails
|
||||
jquery-scrollto-rails
|
||||
|
|
@ -396,7 +398,7 @@ DEPENDENCIES
|
|||
paperclip (~> 4.3)
|
||||
pg
|
||||
puma
|
||||
rails (= 4.2.5)
|
||||
rails (= 4.2.10)
|
||||
rails_12factor
|
||||
rails_autolink (~> 1.1, >= 1.1.6)
|
||||
recaptcha
|
||||
|
|
|
|||
Loading…
Reference in a new issue