mirrors/fluentd-ui
1
0
Fork 0
mirror of https://github.com/fluent/fluentd-ui.git synced 2025-08-10 16:27:06 +02:00
Code Issues Projects Releases Wiki Activity

Update rails 4.1.4 -> 4.1.7

Browse Source
This commit is contained in:
uu59 2014-11-04 13:47:50 +09:00
parent 0d1d5cdad6
commit 659f36774a
2 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Gemfile.lock
View File

@ -14,7 +14,7 @@ PATH
kramdown (> 1.0.0) kramdown (> 1.0.0)
kramdown-haml kramdown-haml
puma puma
rails (= 4.1.4) rails (~> 4.1.7)
rubyzip (~> 1.1) rubyzip (~> 1.1)
sass-rails (~> 4.0.3) sass-rails (~> 4.0.3)
settingslogic settingslogic
@ -24,27 +24,27 @@ PATH
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.1.4) actionmailer (4.1.7)
actionpack (= 4.1.4) actionpack (= 4.1.7)
actionview (= 4.1.4) actionview (= 4.1.7)
mail (~> 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.4) actionpack (4.1.7)
actionview (= 4.1.4) actionview (= 4.1.7)
activesupport (= 4.1.4) activesupport (= 4.1.7)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.4) actionview (4.1.7)
activesupport (= 4.1.4) activesupport (= 4.1.7)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.4) activemodel (4.1.7)
activesupport (= 4.1.4) activesupport (= 4.1.7)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.4) activerecord (4.1.7)
activemodel (= 4.1.4) activemodel (= 4.1.7)
activesupport (= 4.1.4) activesupport (= 4.1.7)
arel (~> 5.0.0) arel (~> 5.0.0)
activesupport (4.1.4) activesupport (4.1.7)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
@ -118,20 +118,19 @@ GEM
kramdown (1.5.0) kramdown (1.5.0)
kramdown-haml (0.0.3) kramdown-haml (0.0.3)
haml haml
mail (2.5.4) mail (2.6.3)
mime-types (~> 1.16) mime-types (>= 1.16, < 3)
treetop (~> 1.4.8) mechanize (2.7.3)
mechanize (2.7.2)
domain_name (~> 0.5, >= 0.5.1) domain_name (~> 0.5, >= 0.5.1)
http-cookie (~> 1.0.0) http-cookie (~> 1.0)
mime-types (~> 1.17, >= 1.17.2) mime-types (~> 2.0)
net-http-digest_auth (~> 1.1, >= 1.1.1) net-http-digest_auth (~> 1.1, >= 1.1.1)
net-http-persistent (~> 2.5, >= 2.5.2) net-http-persistent (~> 2.5, >= 2.5.2)
nokogiri (~> 1.4) nokogiri (~> 1.4)
ntlm-http (~> 0.1, >= 0.1.1) ntlm-http (~> 0.1, >= 0.1.1)
webrobots (>= 0.0.9, < 0.2) webrobots (>= 0.0.9, < 0.2)
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (2.4.3)
mini_portile (0.6.0) mini_portile (0.6.0)
minitest (5.4.2) minitest (5.4.2)
msgpack (0.5.9) msgpack (0.5.9)
@ -146,7 +145,6 @@ GEM
cliver (~> 0.3.1) cliver (~> 0.3.1)
multi_json (~> 1.0) multi_json (~> 1.0)
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
polyglot (0.3.5)
pry (0.10.1) pry (0.10.1)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
@ -156,19 +154,19 @@ GEM
rack (1.5.2) rack (1.5.2)
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.4) rails (4.1.7)
actionmailer (= 4.1.4) actionmailer (= 4.1.7)
actionpack (= 4.1.4) actionpack (= 4.1.7)
actionview (= 4.1.4) actionview (= 4.1.7)
activemodel (= 4.1.4) activemodel (= 4.1.7)
activerecord (= 4.1.4) activerecord (= 4.1.7)
activesupport (= 4.1.4) activesupport (= 4.1.7)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.4) railties (= 4.1.7)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
railties (4.1.4) railties (4.1.7)
actionpack (= 4.1.4) actionpack (= 4.1.7)
activesupport (= 4.1.4) activesupport (= 4.1.7)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.3.2) rake (10.3.2)
@ -219,9 +217,6 @@ GEM
tilt (1.4.1) tilt (1.4.1)
timecop (0.7.1) timecop (0.7.1)
timers (1.1.0) timers (1.1.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo-data (1.2014.9) tzinfo-data (1.2014.9)

2
fluentd-ui.gemspec
View File

@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"] spec.require_paths = ["lib"]
spec.add_dependency "fluentd", "~> 0.10.51" spec.add_dependency "fluentd", "~> 0.10.51"
spec.add_dependency 'rails', '4.1.4' spec.add_dependency 'rails', '~> 4.1.7'
spec.add_dependency 'sucker_punch', "~> 1.0.5" spec.add_dependency 'sucker_punch', "~> 1.0.5"
spec.add_dependency 'addressable' spec.add_dependency 'addressable'
spec.add_dependency "font-awesome-rails" spec.add_dependency "font-awesome-rails"