OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add enter home button.
[pettanr/pettanr.git]
/
Gemfile.lock
diff --git
a/Gemfile.lock
b/Gemfile.lock
index
5158c6c
..
ed34277
100644
(file)
--- a/
Gemfile.lock
+++ b/
Gemfile.lock
@@
-1,7
+1,7
@@
GEM
remote: http://rubygems.org/
specs:
GEM
remote: http://rubygems.org/
specs:
- ZenTest (4.8.
1
)
+ ZenTest (4.8.
2
)
actionmailer (3.1.1)
actionpack (= 3.1.1)
mail (~> 2.3.0)
actionmailer (3.1.1)
actionpack (= 3.1.1)
mail (~> 2.3.0)
@@
-30,7
+30,7
@@
GEM
activesupport (= 3.1.1)
activesupport (3.1.1)
multi_json (~> 1.0)
activesupport (= 3.1.1)
activesupport (3.1.1)
multi_json (~> 1.0)
- addressable (2.
2.8
)
+ addressable (2.
3.2
)
arel (2.2.3)
autotest (4.4.6)
ZenTest (>= 4.4.1)
arel (2.2.3)
autotest (4.4.6)
ZenTest (>= 4.4.1)
@@
-47,7
+47,7
@@
GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.3.
4
)
+ childprocess (0.3.
5
)
ffi (~> 1.0, >= 1.0.6)
choice (0.1.6)
coffee-rails (3.1.1)
ffi (~> 1.0, >= 1.0.6)
choice (0.1.6)
coffee-rails (3.1.1)
@@
-57,7
+57,7
@@
GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
coffee-script-source
execjs
coffee-script-source (1.3.3)
- creative_commons_v30_licenses (0.0.
4
)
+ creative_commons_v30_licenses (0.0.
9
)
rails (~> 3.1.1)
cucumber (1.2.1)
builder (>= 2.1.2)
rails (~> 3.1.1)
cucumber (1.2.1)
builder (>= 2.1.2)
@@
-77,18
+77,18
@@
GEM
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (
3.5
.0)
+ factory_girl (
4.0
.0)
activesupport (>= 3.0.0)
activesupport (>= 3.0.0)
- ffi (1.1.
0
-x86-mingw32)
- gherkin (2.11.
1
-x86-mingw32)
+ ffi (1.1.
5
-x86-mingw32)
+ gherkin (2.11.
2
-x86-mingw32)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
- jquery-rails (
1.0.19
)
- railties (
~> 3
.0)
+ jquery-rails (
2.1.1
)
+ railties (
>= 3.1.0, < 5
.0)
thor (~> 0.14)
thor (~> 0.14)
- json (1.7.
3
)
- libwebsocket (0.1.
4
)
+ json (1.7.
5
)
+ libwebsocket (0.1.
5
)
addressable
mail (2.3.3)
i18n (>= 0.4.0)
addressable
mail (2.3.3)
i18n (>= 0.4.0)
@@
-99,8
+99,16
@@
GEM
multi_json (1.3.6)
nokogiri (1.5.5-x86-mingw32)
orm_adapter (0.0.7)
multi_json (1.3.6)
nokogiri (1.5.5-x86-mingw32)
orm_adapter (0.0.7)
+ pettan_commons_v01_licenses (0.0.6)
+ rails (~> 3.1.1)
+ pettan_protected_v01_licenses (0.0.6)
+ rails (~> 3.1.1)
+ pettan_public_v01_licenses (0.0.6)
+ rails (~> 3.1.1)
pg (0.14.0-x86-mingw32)
polyglot (0.3.3)
pg (0.14.0-x86-mingw32)
polyglot (0.3.3)
+ public_domain_v01_licenses (0.0.6)
+ rails (~> 3.1.1)
rack (1.3.6)
rack-cache (1.2)
rack (>= 0.4)
rack (1.3.6)
rack-cache (1.2)
rack (>= 0.4)
@@
-139,9
+147,9
@@
GEM
rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.11.0)
rspec-core (2.11.1)
rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.11.0)
rspec-core (2.11.1)
- rspec-expectations (2.11.
1
)
+ rspec-expectations (2.11.
2
)
diff-lcs (~> 1.1.3)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.
1
)
+ rspec-mocks (2.11.
2
)
rspec-rails (2.11.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
rspec-rails (2.11.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
@@
-149,7
+157,7
@@
GEM
rspec (~> 2.11.0)
ruby-graphviz (1.0.8)
rubyzip (0.9.9)
rspec (~> 2.11.0)
ruby-graphviz (1.0.8)
rubyzip (0.9.9)
- sass (3.
1.20
)
+ sass (3.
2.1
)
sass-rails (3.1.6)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass-rails (3.1.6)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
@@
-174,9
+182,11
@@
GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
- uglifier (1.2.
6
)
+ uglifier (1.2.
7
)
execjs (>= 0.3.0)
multi_json (~> 1.3)
execjs (>= 0.3.0)
multi_json (~> 1.3)
+ unknown_v01_licenses (0.0.6)
+ rails (~> 3.1.1)
validate_url (0.2.0)
activemodel (>= 3.0.0)
validates_existence (0.7.1)
validate_url (0.2.0)
activemodel (>= 3.0.0)
validates_existence (0.7.1)
@@
-197,7
+207,7
@@
DEPENDENCIES
autotest
aws-s3
coffee-rails (~> 3.1.1)
autotest
aws-s3
coffee-rails (~> 3.1.1)
- creative_commons_v30_licenses
(>= 0.0.4)
+ creative_commons_v30_licenses
cucumber
cucumber-rails
database_cleaner
cucumber
cucumber-rails
database_cleaner
@@
-205,7
+215,11
@@
DEPENDENCIES
factory_girl
jquery-rails
moro-miso
factory_girl
jquery-rails
moro-miso
+ pettan_commons_v01_licenses
+ pettan_protected_v01_licenses
+ pettan_public_v01_licenses
pg
pg
+ public_domain_v01_licenses
rails (= 3.1.1)
rails-erd
rmagick
rails (= 3.1.1)
rails-erd
rmagick
@@
-216,6
+230,7
@@
DEPENDENCIES
standard_licenses
therubyracer-heroku
uglifier (>= 1.0.3)
standard_licenses
therubyracer-heroku
uglifier (>= 1.0.3)
+ unknown_v01_licenses
validate_url
validates_existence
webrat
validate_url
validates_existence
webrat