update for Rails 4.1 final

DanielKehoe · DanielKehoe · commit 0f8f279ddec3 · 2014-04-10T14:46:48.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -21,9 +21,6 @@ db/*.sqlite3
 /log/*
 /tmp/*
 
-# configuration file introduced in Rails 4.1
-/config/secrets.yml
-
 # various artifacts
 **.war
 *.rbc
diff --git a/Gemfile b/Gemfile
@@ -1,16 +1,16 @@
 source 'https://rubygems.org'
 ruby '2.1.1'
-gem 'rails', '4.1.0.rc1'
+gem 'rails', '4.1.0'
 gem 'sqlite3'
-gem 'sass-rails', '~> 4.0.1'
+gem 'sass-rails', '~> 4.0.3'
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.0.0'
 gem 'jquery-rails'
 gem 'turbolinks'
 gem 'jbuilder', '~> 2.0'
 gem 'sdoc', '~> 0.4.0',          group: :doc
 gem 'spring',        group: :development
-gem 'bootstrap-sass', '>= 3.0.0.0'
+gem 'bootstrap-sass'
 gem 'high_voltage'
 group :development do
   gem 'better_errors'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,34 +1,33 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.0.rc1)
-      actionpack (= 4.1.0.rc1)
-      actionview (= 4.1.0.rc1)
+    actionmailer (4.1.0)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
       mail (~> 2.5.4)
-    actionpack (4.1.0.rc1)
-      actionview (= 4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+    actionpack (4.1.0)
+      actionview (= 4.1.0)
+      activesupport (= 4.1.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+    actionview (4.1.0)
+      activesupport (= 4.1.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+    activemodel (4.1.0)
+      activesupport (= 4.1.0)
       builder (~> 3.1)
-    activerecord (4.1.0.rc1)
-      activemodel (= 4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+    activerecord (4.1.0)
+      activemodel (= 4.1.0)
+      activesupport (= 4.1.0)
       arel (~> 5.0.0)
-    activesupport (4.1.0.rc1)
+    activesupport (4.1.0)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.0)
-    atomic (1.1.15)
     better_errors (1.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -51,9 +50,9 @@ GEM
     high_voltage (2.1.0)
     hike (1.2.3)
     i18n (0.6.9)
-    jbuilder (2.0.3)
-      activesupport (>= 3.0.0)
-      multi_json (>= 1.2.0)
+    jbuilder (2.0.6)
+      activesupport (>= 3.0.0, < 5)
+      multi_json (~> 1.2)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -62,38 +61,39 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    minitest (5.3.0)
-    multi_json (1.8.4)
+    minitest (5.3.2)
+    multi_json (1.9.2)
     polyglot (0.3.4)
     quiet_assets (1.0.2)
       railties (>= 3.1, < 5.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.0.rc1)
-      actionmailer (= 4.1.0.rc1)
-      actionpack (= 4.1.0.rc1)
-      actionview (= 4.1.0.rc1)
-      activemodel (= 4.1.0.rc1)
-      activerecord (= 4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+    rails (4.1.0)
+      actionmailer (= 4.1.0)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
+      activemodel (= 4.1.0)
+      activerecord (= 4.1.0)
+      activesupport (= 4.1.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.0.rc1)
-      sprockets-rails (~> 2.0.0)
-    rails_layout (1.0.10)
-    railties (4.1.0.rc1)
-      actionpack (= 4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+      railties (= 4.1.0)
+      sprockets-rails (~> 2.0)
+    rails_layout (1.0.14)
+    railties (4.1.0)
+      actionpack (= 4.1.0)
+      activesupport (= 4.1.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
+    rake (10.2.2)
     rdoc (4.1.1)
       json (~> 1.4)
-    sass (3.2.14)
-    sass-rails (4.0.1)
+    sass (3.2.19)
+    sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
-      sprockets-rails (~> 2.0.0)
+      sass (~> 3.2.0)
+      sprockets (~> 2.8, <= 2.11.0)
+      sprockets-rails (~> 2.0)
     sdoc (0.4.0)
       json (~> 1.8)
       rdoc (~> 4.0, < 5.0)
@@ -103,23 +103,22 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.1.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     sqlite3 (1.3.9)
-    thor (0.18.1)
-    thread_safe (0.2.0)
-      atomic (>= 1.1.7, < 2)
+    thor (0.19.1)
+    thread_safe (0.3.3)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.2.1)
+    turbolinks (2.2.2)
       coffee-rails
     tzinfo (1.1.0)
       thread_safe (~> 0.1)
-    uglifier (2.4.0)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
@@ -129,15 +128,15 @@ PLATFORMS
 DEPENDENCIES
   better_errors
   binding_of_caller
-  bootstrap-sass (>= 3.0.0.0)
+  bootstrap-sass
   coffee-rails (~> 4.0.0)
   high_voltage
   jbuilder (~> 2.0)
   jquery-rails
   quiet_assets
-  rails (= 4.1.0.rc1)
+  rails (= 4.1.0)
   rails_layout
-  sass-rails (~> 4.0.1)
+  sass-rails (~> 4.0.3)
   sdoc (~> 0.4.0)
   spring
   sqlite3
diff --git a/README.textile b/README.textile
@@ -1,6 +1,6 @@
 h1. !http://railsapps.github.io/images/rails-36x36.jpg(Rails Bootstrap)! Rails and Bootstrap
 
-Rails 4.1 example application that integrates Rails and Bootstrap 3.1.
+Rails 4.1 example application that integrates Rails and Bootstrap 3.2.
 
 "Bootstrap":http://getbootstrap.com/ (formerly Twitter Bootstrap) provides CSS stylesheets and JavaScript code for the visual design of websites. Bootstrap is a framework for client-side (browser-based or “front end”) development, much like Ruby on Rails is a framework for server-side development.
 
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -5,9 +5,11 @@
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
  * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
  *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
  *
- *= require_self
  *= require_tree .
+ *= require_self
  */
diff --git a/app/assets/stylesheets/framework_and_overrides.css.scss b/app/assets/stylesheets/framework_and_overrides.css.scss
@@ -1,3 +1,9 @@
+// Temporary workaround for Rails 4.1.2 pending releaase of bootstrap-sass 3.1.2
+//= depend_on_asset "bootstrap/glyphicons-halflings-regular.eot"
+//= depend_on_asset "bootstrap/glyphicons-halflings-regular.svg"
+//= depend_on_asset "bootstrap/glyphicons-halflings-regular.ttf"
+//= depend_on_asset "bootstrap/glyphicons-halflings-regular.woff"
+
 // import the CSS framework
 @import "bootstrap";
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -4,8 +4,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><%= content_for?(:title) ? yield(:title) : "Rails Bootstrap" %></title>
     <meta name="description" content="<%= content_for?(:description) ? yield(:description) : "Rails Bootstrap" %>">
-    <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
-    <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
     <%= csrf_meta_tags %>
   </head>
   <body>
diff --git a/config/database.yml b/config/database.yml
@@ -20,11 +20,6 @@ test:
   <<: *default
   database: db/test.sqlite3
 
-# Do not keep production credentials in the repository,
-# instead read the configuration from the environment.
-#
-# Example:
-#   sqlite3://myuser:mypass@localhost/full/path/to/somedatabase
-#
 production:
-  url: <%= ENV["DATABASE_URL"] %>
+  <<: *default
+  database: db/production.sqlite3
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
@@ -2,4 +2,3 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,3 @@`
`2`	`2`
`3`	`3`	`# Add new mime types for use in respond_to blocks:`
`4`	`4`	`# Mime::Type.register "text/richtext", :rtf`
`5`		`-# Mime::Type.register_alias "text/html", :iphone`