Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump i18n from 0.6.1 to 0.9.5 in /pages #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump i18n from 0.6.1 to 0.9.5 in /pages #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 55 additions & 54 deletions pages/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
PATH
remote: .
specs:
brightcontent-pages (2.0.30)
awesome_nested_set
brightcontent-attachments (= 2.0.30)
brightcontent-core (= 2.0.30)
the_sortable_tree (~> 2.3.0)

PATH
remote: ../attachments
specs:
Expand All @@ -29,38 +20,47 @@ PATH
strong_parameters
will_paginate

PATH
remote: .
specs:
brightcontent-pages (2.0.30)
awesome_nested_set
brightcontent-attachments (= 2.0.30)
brightcontent-core (= 2.0.30)
the_sortable_tree (~> 2.3.0)

GEM
remote: http://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.22.5)
actionpack (= 3.2.22.5)
mail (~> 2.5.4)
actionpack (3.2.22.5)
activemodel (= 3.2.22.5)
activesupport (= 3.2.22.5)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.13)
activesupport (= 3.2.13)
activemodel (3.2.22.5)
activesupport (= 3.2.22.5)
builder (~> 3.0.0)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activerecord (3.2.22.5)
activemodel (= 3.2.22.5)
activesupport (= 3.2.22.5)
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.22.5)
activemodel (= 3.2.22.5)
activesupport (= 3.2.22.5)
activesupport (3.2.22.5)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.3)
arel (3.0.2)
arel (3.0.3)
awesome_nested_set (2.1.6)
activerecord (>= 3.0.0)
bcrypt-ruby (3.0.1)
Expand All @@ -80,6 +80,7 @@ GEM
activesupport (>= 3.0)
cocaine (0.5.1)
climate_control (>= 0.0.3, < 1.0)
concurrent-ruby (1.1.10)
diff-lcs (1.2.1)
erubis (2.7.0)
factory_girl (4.2.0)
Expand All @@ -89,8 +90,9 @@ GEM
railties (>= 3.0.0)
ffi (1.5.0)
has_scope (0.5.1)
hike (1.2.1)
i18n (0.6.1)
hike (1.2.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
responders (~> 0.6)
Expand All @@ -101,46 +103,45 @@ GEM
jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.7)
json (1.8.6)
launchy (2.2.0)
addressable (~> 2.3)
mail (2.5.3)
i18n (>= 0.4.0)
mail (2.5.5)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.21)
multi_json (1.7.2)
mime-types (1.25.1)
multi_json (1.15.0)
nokogiri (1.5.9)
paperclip (3.4.1)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (~> 0.5.0)
mime-types
polyglot (0.3.3)
rack (1.4.5)
rack-cache (1.2)
polyglot (0.3.5)
rack (1.4.7)
rack-cache (1.13.0)
rack (>= 0.4)
rack-ssl (1.3.3)
rack-ssl (1.3.4)
rack
rack-test (0.6.2)
rack-test (0.6.3)
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.22.5)
actionmailer (= 3.2.22.5)
actionpack (= 3.2.22.5)
activerecord (= 3.2.22.5)
activeresource (= 3.2.22.5)
activesupport (= 3.2.22.5)
bundler (~> 1.0)
railties (= 3.2.13)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
railties (= 3.2.22.5)
railties (3.2.22.5)
actionpack (= 3.2.22.5)
activesupport (= 3.2.22.5)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rake (13.0.6)
rdoc (3.12.2)
json (~> 1.4)
responders (0.9.3)
Expand All @@ -165,7 +166,7 @@ GEM
simple_form (2.1.0)
actionpack (~> 3.0)
activemodel (~> 3.0)
sprockets (2.2.2)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand All @@ -177,12 +178,12 @@ GEM
railties (~> 3.0)
the_sortable_tree (2.3.0)
rails (>= 3.1)
thor (0.17.0)
tilt (1.3.6)
treetop (1.4.12)
thor (1.2.1)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
tzinfo (0.3.60)
websocket (1.0.7)
will_paginate (3.0.4)
xpath (1.0.0)
Expand Down