Rails 3.2.15
This commit is contained in:
bry4n
Родитель
e7b131e788
Коммит
07840eebd3
12
Gemfile
12
Gemfile
|
|
@ -1,7 +1,7 @@
|
|||
source 'https://rubygems.org'
|
||||
ruby '1.9.2'
|
||||
|
||||
gem 'rails', '3.2.13'
|
||||
gem 'rails', '3.2.15'
|
||||
|
||||
# Bundle edge Rails instead:
|
||||
# gem 'rails', :git => 'git://github.com/rails/rails.git'
|
||||
|
|
@ -31,12 +31,12 @@ gem "feedzirra"
|
|||
|
||||
# Gems used only for assets and not required
|
||||
# in production environments by default.
|
||||
group :assets do
|
||||
#group :assets do
|
||||
gem 'sass-rails'
|
||||
gem 'compass-rails'
|
||||
gem 'coffee-rails', '~> 3.2.1'
|
||||
gem 'uglifier', '>= 1.0.3'
|
||||
end
|
||||
gem 'coffee-rails'
|
||||
gem 'uglifier'
|
||||
#end
|
||||
|
||||
gem 'jquery-rails'
|
||||
gem 'less-rails-bootstrap'
|
||||
|
|
@ -46,8 +46,8 @@ group :production do
|
|||
end
|
||||
|
||||
group :development do
|
||||
gem 'therubyracer'
|
||||
gem "sqlite3"
|
||||
gem "sqlite3-ruby"
|
||||
gem "shotgun"
|
||||
gem "taps"
|
||||
end
|
||||
|
|
|
|||
253
Gemfile.lock
253
Gemfile.lock
|
|
@ -1,12 +1,12 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (3.2.13)
|
||||
actionpack (= 3.2.13)
|
||||
mail (~> 2.5.3)
|
||||
actionpack (3.2.13)
|
||||
activemodel (= 3.2.13)
|
||||
activesupport (= 3.2.13)
|
||||
actionmailer (3.2.15)
|
||||
actionpack (= 3.2.15)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (3.2.15)
|
||||
activemodel (= 3.2.15)
|
||||
activesupport (= 3.2.15)
|
||||
builder (~> 3.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
journey (~> 1.0.4)
|
||||
|
|
@ -14,113 +14,101 @@ GEM
|
|||
rack-cache (~> 1.2)
|
||||
rack-test (~> 0.6.1)
|
||||
sprockets (~> 2.2.1)
|
||||
activemodel (3.2.13)
|
||||
activesupport (= 3.2.13)
|
||||
activemodel (3.2.15)
|
||||
activesupport (= 3.2.15)
|
||||
builder (~> 3.0.0)
|
||||
activerecord (3.2.13)
|
||||
activemodel (= 3.2.13)
|
||||
activesupport (= 3.2.13)
|
||||
activerecord (3.2.15)
|
||||
activemodel (= 3.2.15)
|
||||
activesupport (= 3.2.15)
|
||||
arel (~> 3.0.2)
|
||||
tzinfo (~> 0.3.29)
|
||||
activeresource (3.2.13)
|
||||
activemodel (= 3.2.13)
|
||||
activesupport (= 3.2.13)
|
||||
activesupport (3.2.13)
|
||||
i18n (= 0.6.1)
|
||||
activeresource (3.2.15)
|
||||
activemodel (= 3.2.15)
|
||||
activesupport (= 3.2.15)
|
||||
activesupport (3.2.15)
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
multi_json (~> 1.0)
|
||||
addressable (2.2.8)
|
||||
addressable (2.3.5)
|
||||
ansi (1.4.3)
|
||||
arel (3.0.2)
|
||||
awesome_print (1.0.2)
|
||||
awesome_print (1.2.0)
|
||||
builder (3.0.4)
|
||||
chunky_png (1.2.5)
|
||||
chunky_png (1.2.8)
|
||||
coffee-rails (3.2.2)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (~> 3.2.0)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.3.1)
|
||||
commonjs (0.2.5)
|
||||
compass (0.12.1)
|
||||
coffee-script-source (1.6.3)
|
||||
commonjs (0.2.7)
|
||||
compass (0.12.2)
|
||||
chunky_png (~> 1.2)
|
||||
fssm (>= 0.2.7)
|
||||
sass (~> 3.1)
|
||||
compass-rails (1.0.1)
|
||||
compass (~> 0.12.0)
|
||||
curb (0.7.18)
|
||||
daemons (1.1.8)
|
||||
dalli (2.0.3)
|
||||
diff-lcs (1.1.3)
|
||||
compass-rails (1.0.3)
|
||||
compass (>= 0.12.2, < 0.14)
|
||||
curb (0.8.5)
|
||||
daemons (1.1.9)
|
||||
dalli (2.6.4)
|
||||
diff-lcs (1.2.4)
|
||||
erubis (2.7.0)
|
||||
eventmachine (0.12.10)
|
||||
exceptional (2.0.32)
|
||||
eventmachine (1.0.3)
|
||||
exceptional (2.0.33)
|
||||
rack
|
||||
excon (0.9.6)
|
||||
execjs (1.3.0)
|
||||
multi_json (~> 1.0)
|
||||
factory_girl (3.1.1)
|
||||
excon (0.27.6)
|
||||
execjs (2.0.2)
|
||||
factory_girl (4.2.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (3.1.0)
|
||||
factory_girl (~> 3.1.0)
|
||||
factory_girl_rails (4.2.1)
|
||||
factory_girl (~> 4.2.0)
|
||||
railties (>= 3.0.0)
|
||||
faraday (0.8.4)
|
||||
multipart-post (~> 1.1)
|
||||
faraday_middleware (0.9.0)
|
||||
faraday (>= 0.7.4, < 0.9)
|
||||
feedzirra (0.0.31)
|
||||
activesupport (>= 3.0.8)
|
||||
builder (~> 3.0.0)
|
||||
curb (~> 0.7.15)
|
||||
i18n (>= 0.5.0)
|
||||
loofah (~> 1.0.0)
|
||||
nokogiri (~> 1.4.4)
|
||||
rake (>= 0.9.2)
|
||||
rdoc (~> 3.8)
|
||||
sax-machine (~> 0.0.20)
|
||||
fssm (0.2.9)
|
||||
haml (3.1.4)
|
||||
hashie (1.2.0)
|
||||
hashr (0.0.21)
|
||||
hike (1.2.1)
|
||||
i18n (0.6.1)
|
||||
faraday (0.8.8)
|
||||
multipart-post (~> 1.2.0)
|
||||
feedzirra (0.2.1)
|
||||
curb (~> 0.8.1)
|
||||
loofah (~> 1.2.1)
|
||||
nokogiri (~> 1.6.0)
|
||||
sax-machine (~> 0.2.1)
|
||||
fssm (0.2.10)
|
||||
haml (4.0.3)
|
||||
tilt
|
||||
hashr (0.0.22)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.5)
|
||||
journey (1.0.4)
|
||||
jquery-rails (2.0.2)
|
||||
railties (>= 3.2.0, < 5.0)
|
||||
thor (~> 0.14)
|
||||
json (1.7.7)
|
||||
launchy (2.1.0)
|
||||
addressable (~> 2.2.6)
|
||||
less (2.1.0)
|
||||
commonjs (~> 0.2.0)
|
||||
therubyracer (~> 0.10.0)
|
||||
less-rails (2.2.1)
|
||||
jquery-rails (3.0.4)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.0)
|
||||
launchy (2.3.0)
|
||||
addressable (~> 2.3)
|
||||
less (2.4.0)
|
||||
commonjs (~> 0.2.7)
|
||||
less-rails (2.4.2)
|
||||
actionpack (>= 3.1)
|
||||
less (~> 2.1.0)
|
||||
less-rails-bootstrap (2.0.10)
|
||||
less-rails (~> 2.2.0)
|
||||
libv8 (3.3.10.4)
|
||||
loofah (1.0.0)
|
||||
nokogiri (>= 1.3.3)
|
||||
mail (2.5.3)
|
||||
i18n (>= 0.4.0)
|
||||
less (~> 2.4.0)
|
||||
less-rails-bootstrap (3.0.3)
|
||||
less-rails (~> 2.4.2)
|
||||
libv8 (3.16.14.3)
|
||||
loofah (1.2.1)
|
||||
nokogiri (>= 1.4.4)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
memcachier (0.0.2)
|
||||
mime-types (1.21)
|
||||
multi_json (1.7.1)
|
||||
multipart-post (1.1.5)
|
||||
nestful (0.0.8)
|
||||
activesupport (>= 3.0.0.beta)
|
||||
netrc (0.7.1)
|
||||
mime-types (1.25)
|
||||
mini_portile (0.5.1)
|
||||
multi_json (1.8.2)
|
||||
multipart-post (1.2.0)
|
||||
nestful (1.0.7)
|
||||
netrc (0.7.7)
|
||||
newrelic_rpm (3.5.3.25)
|
||||
nokogiri (1.4.7)
|
||||
octokit (1.18.0)
|
||||
addressable (~> 2.2)
|
||||
faraday (~> 0.8)
|
||||
faraday_middleware (~> 0.8)
|
||||
hashie (~> 1.2)
|
||||
multi_json (~> 1.3)
|
||||
pg (0.13.2)
|
||||
nokogiri (1.6.0)
|
||||
mini_portile (~> 0.5.0)
|
||||
octokit (2.4.0)
|
||||
sawyer (~> 0.5.1)
|
||||
pg (0.17.0)
|
||||
polyglot (0.3.3)
|
||||
rack (1.4.5)
|
||||
rack-cache (1.2)
|
||||
|
|
@ -129,43 +117,48 @@ GEM
|
|||
rack
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (3.2.13)
|
||||
actionmailer (= 3.2.13)
|
||||
actionpack (= 3.2.13)
|
||||
activerecord (= 3.2.13)
|
||||
activeresource (= 3.2.13)
|
||||
activesupport (= 3.2.13)
|
||||
rails (3.2.15)
|
||||
actionmailer (= 3.2.15)
|
||||
actionpack (= 3.2.15)
|
||||
activerecord (= 3.2.15)
|
||||
activeresource (= 3.2.15)
|
||||
activesupport (= 3.2.15)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.2.13)
|
||||
railties (3.2.13)
|
||||
actionpack (= 3.2.13)
|
||||
activesupport (= 3.2.13)
|
||||
railties (= 3.2.15)
|
||||
railties (3.2.15)
|
||||
actionpack (= 3.2.15)
|
||||
activesupport (= 3.2.15)
|
||||
rack-ssl (~> 1.3.2)
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (>= 0.14.6, < 2.0)
|
||||
rake (10.0.3)
|
||||
rake (10.1.0)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
redcarpet (2.1.1)
|
||||
redcarpet (3.0.0)
|
||||
ref (1.0.5)
|
||||
rest-client (1.6.7)
|
||||
mime-types (>= 1.16)
|
||||
rubyzip (0.9.7)
|
||||
sass (3.1.15)
|
||||
sass-rails (3.2.5)
|
||||
rubyzip (1.0.0)
|
||||
sass (3.2.12)
|
||||
sass-rails (3.2.6)
|
||||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
sax-machine (0.0.20)
|
||||
nokogiri (> 0.0.0)
|
||||
sawyer (0.5.1)
|
||||
addressable (~> 2.3.5)
|
||||
faraday (~> 0.8, < 0.10)
|
||||
sax-machine (0.2.1)
|
||||
nokogiri (~> 1.6.0)
|
||||
sequel (3.20.0)
|
||||
shotgun (0.9)
|
||||
rack (>= 1.0)
|
||||
shoulda (3.0.1)
|
||||
shoulda-context (~> 1.0.0)
|
||||
shoulda-matchers (~> 1.0.0)
|
||||
shoulda-context (1.0.0)
|
||||
shoulda-matchers (1.0.0)
|
||||
shoulda (3.5.0)
|
||||
shoulda-context (~> 1.0, >= 1.0.1)
|
||||
shoulda-matchers (>= 1.4.1, < 3.0)
|
||||
shoulda-context (1.1.5)
|
||||
shoulda-matchers (2.4.0)
|
||||
activesupport (>= 3.0.0)
|
||||
sinatra (1.0)
|
||||
rack (>= 1.0)
|
||||
sprockets (2.2.2)
|
||||
|
|
@ -173,36 +166,36 @@ GEM
|
|||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sqlite3 (1.3.6)
|
||||
sqlite3-ruby (1.3.3)
|
||||
sqlite3 (>= 1.3.3)
|
||||
taps (0.3.23)
|
||||
sqlite3 (1.3.8)
|
||||
taps (0.3.24)
|
||||
rack (>= 1.0.1)
|
||||
rest-client (>= 1.4.0, < 1.7.0)
|
||||
sequel (~> 3.20.0)
|
||||
sinatra (~> 1.0.0)
|
||||
sqlite3-ruby (~> 1.2)
|
||||
therubyracer (0.10.1)
|
||||
libv8 (~> 3.3.10)
|
||||
thin (1.3.1)
|
||||
therubyracer (0.12.0)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
thin (1.5.1)
|
||||
daemons (>= 1.0.9)
|
||||
eventmachine (>= 0.12.6)
|
||||
rack (>= 1.0.0)
|
||||
thor (0.17.0)
|
||||
tilt (1.3.6)
|
||||
tire (0.4.2)
|
||||
thor (0.18.1)
|
||||
tilt (1.4.1)
|
||||
tire (0.6.1)
|
||||
activemodel (>= 3.0)
|
||||
activesupport
|
||||
ansi
|
||||
hashr (~> 0.0.19)
|
||||
multi_json (~> 1.0)
|
||||
multi_json (~> 1.3)
|
||||
rake
|
||||
rest-client (~> 1.6)
|
||||
treetop (1.4.12)
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.37)
|
||||
uglifier (1.2.4)
|
||||
tzinfo (0.3.38)
|
||||
uglifier (2.2.1)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (>= 1.0.2)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
yajl-ruby (1.1.0)
|
||||
|
||||
PLATFORMS
|
||||
|
|
@ -210,7 +203,7 @@ PLATFORMS
|
|||
|
||||
DEPENDENCIES
|
||||
awesome_print
|
||||
coffee-rails (~> 3.2.1)
|
||||
coffee-rails
|
||||
compass-rails
|
||||
dalli
|
||||
diff-lcs
|
||||
|
|
@ -230,7 +223,7 @@ DEPENDENCIES
|
|||
newrelic_rpm (~> 3.5.3.25)
|
||||
octokit
|
||||
pg
|
||||
rails (= 3.2.13)
|
||||
rails (= 3.2.15)
|
||||
redcarpet
|
||||
rest-client
|
||||
rubyzip
|
||||
|
|
@ -238,10 +231,10 @@ DEPENDENCIES
|
|||
shotgun
|
||||
shoulda
|
||||
sqlite3
|
||||
sqlite3-ruby
|
||||
taps
|
||||
therubyracer
|
||||
thin
|
||||
tilt
|
||||
tire
|
||||
uglifier (>= 1.0.3)
|
||||
uglifier
|
||||
yajl-ruby
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче