Mercurial > zeropaste

changeset 258:ceb44fca8b4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Welcome to bootstrap 3.
author edogawaconan <me@myconan.net>
date Tue, 15 Oct 2013 21:51:31 +0900
parents 2d5c09a73958
children 5d084a9716ca
files Gemfile Gemfile.lock
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Gemfile	Tue Oct 15 18:02:25 2013 +0900
+++ b/Gemfile	Tue Oct 15 21:51:31 2013 +0900
@@ -14,7 +14,7 @@
 gem 'sass-rails', '~> 4.0.0.rc1'
 
 gem 'uglifier'
-gem 'anjlab-bootstrap-rails', '~>2.3.0', require: 'bootstrap-rails'
+gem 'anjlab-bootstrap-rails', require: 'bootstrap-rails'
 
 gem 'therubyrhino', platforms: :jruby
 
--- a/Gemfile.lock	Tue Oct 15 18:02:25 2013 +0900
+++ b/Gemfile.lock	Tue Oct 15 21:51:31 2013 +0900
@@ -32,7 +32,7 @@
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    anjlab-bootstrap-rails (2.3.1.2)
+    anjlab-bootstrap-rails (3.0.0.3)
       railties (>= 3.0)
       sass (>= 3.2)
     arel (4.0.0)
@@ -56,7 +56,7 @@
       treetop (~> 1.4.8)
     mime-types (1.25)
     minitest (4.7.5)
-    multi_json (1.8.1)
+    multi_json (1.8.2)
     newrelic_rpm (3.6.8.164)
     pg (0.17.0)
     polyglot (0.3.3)
@@ -126,7 +126,7 @@
 DEPENDENCIES
   actionpack-page_caching
   activerecord-jdbcpostgresql-adapter
-  anjlab-bootstrap-rails (~> 2.3.0)
+  anjlab-bootstrap-rails
   jquery-rails
   jruby-openssl
   newrelic_rpm