Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

update to 2.1.1.0 bootstrap-sass

  • Loading branch information...
commit 259ff56c0022d3daac287c9d7b62b428f1c7a1fd 1 parent 80c7e9f
@ghoppe authored
Showing with 42 additions and 41 deletions.
  1. +1 −1  Gemfile
  2. +39 −39 Gemfile.lock
  3. +2 −1  refinerycms-bootstrap.gemspec
View
2  Gemfile
@@ -58,7 +58,7 @@ group :assets do
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
- gem 'bootstrap-sass', '~> 2.1.0.1'
+ gem 'bootstrap-sass', '~> 2.1.1.0'
end
gem 'jquery-rails'
View
78 Gemfile.lock
@@ -55,35 +55,36 @@ PATH
remote: .
specs:
refinerycms-bootstrap (2.1.0.dev)
- bootstrap-sass (~> 2.1.0.1)
+ bootstrap-sass (~> 2.1.1.0)
refinerycms-core (~> 2.0)
refinerycms-images (~> 2.0)
+ sass-rails (~> 3.1)
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.8)
- actionpack (= 3.2.8)
+ actionmailer (3.2.9)
+ actionpack (= 3.2.9)
mail (~> 2.4.4)
- actionpack (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
+ actionpack (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.3)
- activemodel (3.2.8)
- activesupport (= 3.2.8)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
- activerecord (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
+ activerecord (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activesupport (3.2.8)
+ activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
acts_as_indexed (0.7.8)
@@ -93,9 +94,9 @@ GEM
activerecord (>= 3.0.0)
babosa (0.3.8)
bcrypt-ruby (3.0.1)
- bootstrap-sass (2.1.0.1)
+ bootstrap-sass (2.1.1.0)
builder (3.0.4)
- capybara (1.1.2)
+ capybara (1.1.3)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@@ -111,7 +112,7 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.3)
+ coffee-script-source (1.4.0)
database_cleaner (0.7.2)
devise (2.1.2)
bcrypt-ruby (~> 3.0)
@@ -130,18 +131,18 @@ GEM
factory_girl (~> 2.6.0)
railties (>= 3.0.0)
ffi (1.1.5)
- friendly_id (4.0.8)
+ friendly_id (4.0.9)
globalize3 (0.2.0)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
paper_trail (~> 2)
growl (1.0.3)
- guard (1.5.0)
+ guard (1.5.4)
listen (>= 0.4.2)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
thor (>= 0.14.6)
- guard-spork (1.2.1)
+ guard-spork (1.2.3)
childprocess (>= 0.2.3)
guard (>= 1.1)
spork (>= 0.8.4)
@@ -163,7 +164,7 @@ GEM
treetop (~> 1.4.8)
method_source (0.8.1)
mime-types (1.19)
- multi_json (1.3.6)
+ multi_json (1.3.7)
nokogiri (1.5.5)
orm_adapter (0.4.0)
paper_trail (2.6.3)
@@ -181,37 +182,35 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- railties (3.2.8)
- actionpack (= 3.2.8)
- activesupport (= 3.2.8)
+ railties (3.2.9)
+ actionpack (= 3.2.9)
+ activesupport (= 3.2.9)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
+ rake (10.0.0)
rb-fsevent (0.9.2)
rdoc (3.12)
json (~> 1.4)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.3)
+ rspec-core (2.12.0)
+ rspec-expectations (2.12.0)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.3)
- rspec-rails (2.11.4)
+ rspec-mocks (2.12.0)
+ rspec-rails (2.12.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.11.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
rubyzip (0.9.9)
- sass (3.2.1)
+ sass (3.2.3)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.25.0)
+ selenium-webdriver (2.26.0)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
@@ -220,19 +219,20 @@ GEM
railties (>= 3.0.0)
slop (3.3.3)
spork (0.9.0.rc9)
- sprockets (2.1.3)
+ sprockets (2.2.1)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
sys-proctable (0.9.2)
thor (0.16.0)
tilt (1.3.3)
- treetop (1.4.11)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
truncate_html (0.5.5)
- tzinfo (0.3.33)
+ tzinfo (0.3.35)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@ -247,7 +247,7 @@ PLATFORMS
DEPENDENCIES
activerecord-jdbcsqlite3-adapter
- bootstrap-sass (~> 2.1.0.1)
+ bootstrap-sass (~> 2.1.1.0)
coffee-rails
growl (~> 1.0.3)
guard-spork
View
3  refinerycms-bootstrap.gemspec
@@ -14,5 +14,6 @@ Gem::Specification.new do |s|
# Runtime dependencies
s.add_dependency 'refinerycms-core', '~> 2.0'
s.add_dependency 'refinerycms-images', '~> 2.0'
- s.add_dependency 'bootstrap-sass', '~> 2.1.0.1'
+ s.add_dependency 'sass-rails', '~> 3.1'
+ s.add_dependency 'bootstrap-sass', '~> 2.1.1.0'
end
Please sign in to comment.
Something went wrong with that request. Please try again.