rails up to 3.2.13
This commit is contained in:
Dmitriy Zaporozhets
parent
8ec01e0ba9
commit
fb4f171587
4
Gemfile
4
Gemfile
|
|
@ -8,7 +8,7 @@ def linux_only(require_as)
|
||||||
RUBY_PLATFORM.include?('linux') && require_as
|
RUBY_PLATFORM.include?('linux') && require_as
|
||||||
end
|
end
|
||||||
|
|
||||||
gem "rails", "3.2.12"
|
gem "rails", "3.2.13"
|
||||||
|
|
||||||
# Supported DBs
|
# Supported DBs
|
||||||
gem "mysql2", group: :mysql
|
gem "mysql2", group: :mysql
|
||||||
|
|
@ -99,7 +99,7 @@ gem "colored"
|
||||||
# GitLab settings
|
# GitLab settings
|
||||||
gem 'settingslogic'
|
gem 'settingslogic'
|
||||||
|
|
||||||
# Wiki
|
# Wiki
|
||||||
# - Use latest master to resolve Gem dependency with Pygemnts
|
# - Use latest master to resolve Gem dependency with Pygemnts
|
||||||
# github-linquist needs pygments 0.4.2 but Gollum 2.4.11
|
# github-linquist needs pygments 0.4.2 but Gollum 2.4.11
|
||||||
# requires pygments 0.3.2. The latest master Gollum has been updated
|
# requires pygments 0.3.2. The latest master Gollum has been updated
|
||||||
|
|
|
||||||
64
Gemfile.lock
64
Gemfile.lock
|
|
@ -32,12 +32,12 @@ GIT
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (3.2.12)
|
actionmailer (3.2.13)
|
||||||
actionpack (= 3.2.12)
|
actionpack (= 3.2.13)
|
||||||
mail (~> 2.4.4)
|
mail (~> 2.5.3)
|
||||||
actionpack (3.2.12)
|
actionpack (3.2.13)
|
||||||
activemodel (= 3.2.12)
|
activemodel (= 3.2.13)
|
||||||
activesupport (= 3.2.12)
|
activesupport (= 3.2.13)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
journey (~> 1.0.4)
|
journey (~> 1.0.4)
|
||||||
|
|
@ -45,19 +45,19 @@ GEM
|
||||||
rack-cache (~> 1.2)
|
rack-cache (~> 1.2)
|
||||||
rack-test (~> 0.6.1)
|
rack-test (~> 0.6.1)
|
||||||
sprockets (~> 2.2.1)
|
sprockets (~> 2.2.1)
|
||||||
activemodel (3.2.12)
|
activemodel (3.2.13)
|
||||||
activesupport (= 3.2.12)
|
activesupport (= 3.2.13)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
activerecord (3.2.12)
|
activerecord (3.2.13)
|
||||||
activemodel (= 3.2.12)
|
activemodel (= 3.2.13)
|
||||||
activesupport (= 3.2.12)
|
activesupport (= 3.2.13)
|
||||||
arel (~> 3.0.2)
|
arel (~> 3.0.2)
|
||||||
tzinfo (~> 0.3.29)
|
tzinfo (~> 0.3.29)
|
||||||
activeresource (3.2.12)
|
activeresource (3.2.13)
|
||||||
activemodel (= 3.2.12)
|
activemodel (= 3.2.13)
|
||||||
activesupport (= 3.2.12)
|
activesupport (= 3.2.13)
|
||||||
activesupport (3.2.12)
|
activesupport (3.2.13)
|
||||||
i18n (~> 0.6)
|
i18n (= 0.6.1)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
acts-as-taggable-on (2.3.3)
|
acts-as-taggable-on (2.3.3)
|
||||||
rails (~> 3.0)
|
rails (~> 3.0)
|
||||||
|
|
@ -226,7 +226,7 @@ GEM
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
multi_xml (>= 0.5.2)
|
multi_xml (>= 0.5.2)
|
||||||
httpauth (0.2.0)
|
httpauth (0.2.0)
|
||||||
i18n (0.6.4)
|
i18n (0.6.1)
|
||||||
journey (1.0.4)
|
journey (1.0.4)
|
||||||
jquery-atwho-rails (0.1.7)
|
jquery-atwho-rails (0.1.7)
|
||||||
jquery-rails (2.1.3)
|
jquery-rails (2.1.3)
|
||||||
|
|
@ -249,7 +249,7 @@ GEM
|
||||||
libv8 (3.3.10.4)
|
libv8 (3.3.10.4)
|
||||||
listen (0.5.3)
|
listen (0.5.3)
|
||||||
lumberjack (1.0.2)
|
lumberjack (1.0.2)
|
||||||
mail (2.4.4)
|
mail (2.5.3)
|
||||||
i18n (>= 0.4.0)
|
i18n (>= 0.4.0)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
|
|
@ -257,7 +257,7 @@ GEM
|
||||||
mime-types (1.21)
|
mime-types (1.21)
|
||||||
modernizr (2.6.2)
|
modernizr (2.6.2)
|
||||||
sprockets (~> 2.0)
|
sprockets (~> 2.0)
|
||||||
multi_json (1.6.1)
|
multi_json (1.7.1)
|
||||||
multi_xml (0.5.3)
|
multi_xml (0.5.3)
|
||||||
multipart-post (1.1.5)
|
multipart-post (1.1.5)
|
||||||
mustache (0.99.4)
|
mustache (0.99.4)
|
||||||
|
|
@ -323,14 +323,14 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.2.12)
|
rails (3.2.13)
|
||||||
actionmailer (= 3.2.12)
|
actionmailer (= 3.2.13)
|
||||||
actionpack (= 3.2.12)
|
actionpack (= 3.2.13)
|
||||||
activerecord (= 3.2.12)
|
activerecord (= 3.2.13)
|
||||||
activeresource (= 3.2.12)
|
activeresource (= 3.2.13)
|
||||||
activesupport (= 3.2.12)
|
activesupport (= 3.2.13)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.2.12)
|
railties (= 3.2.13)
|
||||||
rails-dev-tweaks (0.6.1)
|
rails-dev-tweaks (0.6.1)
|
||||||
actionpack (~> 3.1)
|
actionpack (~> 3.1)
|
||||||
railties (~> 3.1)
|
railties (~> 3.1)
|
||||||
|
|
@ -342,9 +342,9 @@ GEM
|
||||||
erubis
|
erubis
|
||||||
i18n
|
i18n
|
||||||
progressbar
|
progressbar
|
||||||
railties (3.2.12)
|
railties (3.2.13)
|
||||||
actionpack (= 3.2.12)
|
actionpack (= 3.2.13)
|
||||||
activesupport (= 3.2.12)
|
activesupport (= 3.2.13)
|
||||||
rack-ssl (~> 1.3.2)
|
rack-ssl (~> 1.3.2)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
rdoc (~> 3.4)
|
rdoc (~> 3.4)
|
||||||
|
|
@ -464,12 +464,12 @@ GEM
|
||||||
eventmachine (>= 0.12.6)
|
eventmachine (>= 0.12.6)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
thor (0.17.0)
|
thor (0.17.0)
|
||||||
tilt (1.3.4)
|
tilt (1.3.6)
|
||||||
timers (1.1.0)
|
timers (1.1.0)
|
||||||
treetop (1.4.12)
|
treetop (1.4.12)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
tzinfo (0.3.35)
|
tzinfo (0.3.37)
|
||||||
uglifier (1.3.0)
|
uglifier (1.3.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
multi_json (~> 1.0, >= 1.0.2)
|
multi_json (~> 1.0, >= 1.0.2)
|
||||||
|
|
@ -553,7 +553,7 @@ DEPENDENCIES
|
||||||
pry
|
pry
|
||||||
quiet_assets (~> 1.0.1)
|
quiet_assets (~> 1.0.1)
|
||||||
rack-mini-profiler
|
rack-mini-profiler
|
||||||
rails (= 3.2.12)
|
rails (= 3.2.13)
|
||||||
rails-dev-tweaks
|
rails-dev-tweaks
|
||||||
rails_best_practices
|
rails_best_practices
|
||||||
raphael-rails!
|
raphael-rails!
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue