Commit ebf1e35e authored by cp's avatar cp

updated ruby to 2.3.3

git-svn-id: http://svn.sp-service.com.ua/svnroot/svn/base_site/trunk@6 d975c5f9-4e99-4c31-b122-d878075b96d9
parent 4d2d5a24
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" default="false" project-jdk-name="ruby-2.1.5-p273" project-jdk-type="RUBY_SDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" default="false" project-jdk-name="ruby-2.3.3-p222" project-jdk-type="RUBY_SDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
<component name="SvnBranchConfigurationManager"> <component name="SvnBranchConfigurationManager">
......
...@@ -27,9 +27,8 @@ gem 'will_paginate' ...@@ -27,9 +27,8 @@ gem 'will_paginate'
gem 'bootstrap-will_paginate' gem 'bootstrap-will_paginate'
gem 'momentjs-rails', '>= 2.9.0' gem 'momentjs-rails', '>= 2.9.0'
gem 'bootstrap3-datetimepicker-rails', '~> 4.15.35' gem 'bootstrap3-datetimepicker-rails', '~> 4.15.35'
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'tzinfo-data', platforms: [:mingw, :mswin, :jruby]
group :development do group :development do
gem 'web-console', '~> 2.0' gem 'web-console', '~> 2.0'
gem 'capistrano', '~> 3.6.1' gem 'capistrano', '~> 3.6.1'
...@@ -39,4 +38,3 @@ group :development do ...@@ -39,4 +38,3 @@ group :development do
gem 'capistrano-rails' gem 'capistrano-rails'
end end
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
...@@ -36,12 +36,12 @@ GEM ...@@ -36,12 +36,12 @@ GEM
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
acts_as_list (0.8.2) acts_as_list (0.9.0)
activerecord (>= 3.0) activerecord (>= 3.0)
airbrussh (1.1.1) airbrussh (1.1.2)
sshkit (>= 1.6.1, != 1.7.0) sshkit (>= 1.6.1, != 1.7.0)
arel (6.0.3) arel (6.0.4)
autoprefixer-rails (6.5.4) autoprefixer-rails (6.7.0)
execjs execjs
bcrypt (3.1.11-x64-mingw32) bcrypt (3.1.11-x64-mingw32)
bcrypt (3.1.11-x86-mingw32) bcrypt (3.1.11-x86-mingw32)
...@@ -54,7 +54,7 @@ GEM ...@@ -54,7 +54,7 @@ GEM
will_paginate will_paginate
bootstrap3-datetimepicker-rails (4.15.35) bootstrap3-datetimepicker-rails (4.15.35)
momentjs-rails (>= 2.8.1) momentjs-rails (>= 2.8.1)
builder (3.2.2) builder (3.2.3)
capistrano (3.6.1) capistrano (3.6.1)
airbrussh (>= 1.0.0) airbrussh (>= 1.0.0)
capistrano-harrow capistrano-harrow
...@@ -67,23 +67,20 @@ GEM ...@@ -67,23 +67,20 @@ GEM
capistrano-faster-assets (1.0.2) capistrano-faster-assets (1.0.2)
capistrano (>= 3.1) capistrano (>= 3.1)
capistrano-harrow (0.5.3) capistrano-harrow (0.5.3)
capistrano-rails (1.2.0) capistrano-rails (1.2.2)
capistrano (~> 3.1) capistrano (~> 3.1)
capistrano-bundler (~> 1.1) capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.2) capistrano-rvm (0.1.2)
capistrano (~> 3.0) capistrano (~> 3.0)
sshkit (~> 1.2) sshkit (~> 1.2)
carrierwave (0.11.2) carrierwave (1.0.0)
activemodel (>= 3.2.0) activemodel (>= 4.0.0)
activesupport (>= 3.2.0) activesupport (>= 4.0.0)
json (>= 1.7)
mime-types (>= 1.16) mime-types (>= 1.16)
mimemagic (>= 0.3.0)
ckeditor (4.2.2) ckeditor (4.2.2)
cocaine cocaine
orm_adapter (~> 0.5.0) orm_adapter (~> 0.5.0)
climate_control (0.0.3) climate_control (0.1.0)
activesupport (>= 3.0)
cocaine (0.5.8) cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0) climate_control (>= 0.0.3, < 1.0)
coffee-rails (4.1.1) coffee-rails (4.1.1)
...@@ -94,7 +91,7 @@ GEM ...@@ -94,7 +91,7 @@ GEM
execjs execjs
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
commonjs (0.2.7) commonjs (0.2.7)
concurrent-ruby (1.0.3) concurrent-ruby (1.0.4)
debug_inspector (0.0.2) debug_inspector (0.0.2)
devise (4.2.0) devise (4.2.0)
bcrypt (~> 3.0) bcrypt (~> 3.0)
...@@ -117,22 +114,22 @@ GEM ...@@ -117,22 +114,22 @@ GEM
haml (>= 4.0.6, < 5.0) haml (>= 4.0.6, < 5.0)
html2haml (>= 1.0.1) html2haml (>= 1.0.1)
railties (>= 4.0.1) railties (>= 4.0.1)
html2haml (2.0.0) html2haml (2.1.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
haml (~> 4.0.0) haml (~> 4.0)
nokogiri (~> 1.6.0) nokogiri (>= 1.6.0)
ruby_parser (~> 3.5) ruby_parser (~> 3.5)
i18n (0.7.0) i18n (0.7.0)
jbuilder (2.6.1) jbuilder (2.6.1)
activesupport (>= 3.0.0, < 5.1) activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2) multi_json (~> 1.2)
jquery-rails (4.2.1) jquery-rails (4.2.2)
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)
jquery-ui-rails (6.0.1) jquery-ui-rails (6.0.1)
railties (>= 3.2.16) railties (>= 3.2.16)
json (1.8.3) json (1.8.6)
less (2.6.0) less (2.6.0)
commonjs (~> 0.2.7) commonjs (~> 0.2.7)
less-rails (2.8.0) less-rails (2.8.0)
...@@ -147,11 +144,10 @@ GEM ...@@ -147,11 +144,10 @@ GEM
mime-types (3.1) mime-types (3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521) mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_magick (4.6.0) mini_magick (4.6.0)
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
minitest (5.10.1) minitest (5.10.1)
momentjs-rails (2.15.1) momentjs-rails (2.17.1)
railties (>= 3.1) railties (>= 3.1)
multi_json (1.12.1) multi_json (1.12.1)
mysql2 (0.4.5-x64-mingw32) mysql2 (0.4.5-x64-mingw32)
...@@ -159,10 +155,10 @@ GEM ...@@ -159,10 +155,10 @@ GEM
nested_form (0.3.2) nested_form (0.3.2)
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (3.2.0) net-ssh (4.0.1)
nokogiri (1.6.8.1-x64-mingw32) nokogiri (1.7.0.1-x64-mingw32)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
nokogiri (1.6.8.1-x86-mingw32) nokogiri (1.7.0.1-x86-mingw32)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
rack (1.6.5) rack (1.6.5)
...@@ -181,9 +177,9 @@ GEM ...@@ -181,9 +177,9 @@ GEM
sprockets-rails sprockets-rails
rails-deprecated_sanitizer (1.0.3) rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha) activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7) rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0) activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0) nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1) rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3) rails-html-sanitizer (1.0.3)
loofah (~> 2.0) loofah (~> 2.0)
...@@ -196,9 +192,9 @@ GEM ...@@ -196,9 +192,9 @@ GEM
rdoc (4.3.0) rdoc (4.3.0)
responders (2.3.0) responders (2.3.0)
railties (>= 4.2.0, < 5.1) railties (>= 4.2.0, < 5.1)
ruby_parser (3.8.3) ruby_parser (3.8.4)
sexp_processor (~> 4.1) sexp_processor (~> 4.1)
sass (3.4.22) sass (3.4.23)
sass-rails (5.0.6) sass-rails (5.0.6)
railties (>= 4.0.0, < 6) railties (>= 4.0.0, < 6)
sass (~> 3.1) sass (~> 3.1)
...@@ -209,10 +205,10 @@ GEM ...@@ -209,10 +205,10 @@ GEM
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0) rdoc (~> 4.0)
sexp_processor (4.7.0) sexp_processor (4.7.0)
simple_form (3.3.1) simple_form (3.4.0)
actionpack (> 4, < 5.1) actionpack (> 4, < 5.1)
activemodel (> 4, < 5.1) activemodel (> 4, < 5.1)
sprockets (3.7.0) 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.0)
...@@ -288,4 +284,4 @@ DEPENDENCIES ...@@ -288,4 +284,4 @@ DEPENDENCIES
will_paginate will_paginate
BUNDLED WITH BUNDLED WITH
1.13.6 1.14.2
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment