Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updated to latest bootstrap-sass gem

  • Loading branch information...
commit 94f760720a3916ef642a7750c6462be56fc74475 1 parent 9b0ebbf
Eric Ryan Jones authored
Showing with 4 additions and 3 deletions.
  1. +1 −1  Gemfile
  2. +2 −2 Gemfile.lock
  3. +1 −0  app/views/messages/index.html.erb
View
2  Gemfile
@@ -6,7 +6,7 @@ gem 'jquery-rails'
gem 'acts_as_commentable_with_threading'
gem 'geocoder'
# gem 'carmen-rails'
-gem "bootstrap-sass", ">= 2.1.1.0"
+gem "bootstrap-sass", ">= 3.0.2.1"
gem "devise", ">= 2.1.2"
gem "cancan", ">= 1.6.8"
gem "rolify", ">= 3.2.0"
View
4 Gemfile.lock
@@ -51,7 +51,7 @@ GEM
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- bootstrap-sass (2.3.1.3)
+ bootstrap-sass (3.0.2.1)
sass (~> 3.2)
builder (3.0.4)
cancan (1.6.10)
@@ -202,7 +202,7 @@ DEPENDENCIES
acts_as_commentable_with_threading
better_errors (>= 0.2.0)
binding_of_caller (>= 0.6.8)
- bootstrap-sass (>= 2.1.1.0)
+ bootstrap-sass (>= 3.0.2.1)
cancan (>= 1.6.8)
capybara (>= 2.0.1)
coffee-rails (~> 3.2.1)
View
1  app/views/messages/index.html.erb
@@ -1,5 +1,6 @@
<h1>Messages</h1>
<h2>Received Messages</h2>
+
<div class="messagesInbox">
<%= render :partial => 'messages/inbox', :collection => @messages, :as => :message %>
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.