Skip to content

Commit

Permalink
Update nocms-blocks dependency.
Browse files Browse the repository at this point in the history
  • Loading branch information
Luis Mendo committed Sep 10, 2015
1 parent fa42a34 commit 2442bd0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 19 deletions.
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,3 @@ group :test do
gem 'capybara'
gem 'database_cleaner'
end

gem "nocms-blocks", git: '[email protected]:simplelogica/nocms-blocks.git', branch: 'master'
26 changes: 10 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
GIT
remote: [email protected]:simplelogica/nocms-blocks.git
revision: efb13dcfcd324a862612e0f024d0ba6ed319a296
branch: master
specs:
nocms-blocks (0.0.1)
awesome_nested_set (>= 3.0.0.rc.6)
rails (~> 4.0, >= 4.0.3)

PATH
remote: .
specs:
nocms-pages (0.0.1)
nocms-pages (0.1.0)
awesome_nested_set (>= 3.0.0.rc.6)
globalize (~> 4.0, >= 4.0.0)
nocms-blocks
nocms-blocks (~> 1.1.1)
rails (~> 4.0, >= 4.0.3)

GEM
Expand All @@ -36,15 +27,15 @@ GEM
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.3)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activerecord-deprecated_finders (1.0.4)
activesupport (4.0.3)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
arel (4.0.2)
awesome_nested_set (3.0.1)
awesome_nested_set (3.0.2)
activerecord (>= 4.0.0, < 5)
builder (3.1.4)
capybara (2.2.1)
Expand All @@ -65,7 +56,7 @@ GEM
activesupport (>= 3.0.0)
faker (1.2.0)
i18n (~> 0.5)
globalize (4.0.1)
globalize (4.0.3)
activemodel (>= 4.0.0, < 5)
activerecord (>= 4.0.0, < 5)
hike (1.2.3)
Expand All @@ -78,6 +69,10 @@ GEM
mini_portile (0.5.2)
minitest (4.7.5)
multi_json (1.10.1)
nocms-blocks (1.1.1)
awesome_nested_set (~> 3.0.0)
globalize (>= 4.0.0, < 5.1)
rails (~> 4.0, <= 4.2.3)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
polyglot (0.3.5)
Expand Down Expand Up @@ -118,7 +113,7 @@ GEM
rspec-mocks (= 3.0.0.beta2)
rspec-support (= 3.0.0.beta2)
rspec-support (3.0.0.beta2)
sprockets (2.12.3)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand Down Expand Up @@ -147,7 +142,6 @@ DEPENDENCIES
database_cleaner
factory_girl
faker
nocms-blocks!
nocms-pages!
rspec-rails (~> 3.0.0.beta)
sqlite3
2 changes: 1 addition & 1 deletion pages.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.add_dependency "rails", '~> 4.0', '>= 4.0.3'
s.add_dependency "globalize", '~> 4.0', '>= 4.0.0'
s.add_dependency "awesome_nested_set", '>= 3.0.0.rc.6'
s.add_dependency "nocms-blocks"
s.add_dependency "nocms-blocks", '~> 1.1.1'

s.add_development_dependency "sqlite3"
end

0 comments on commit 2442bd0

Please sign in to comment.