Skip to content

Commit

Permalink
update to Rails 4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielKehoe committed Mar 2, 2014
1 parent de8bd93 commit 95f890d
Show file tree
Hide file tree
Showing 33 changed files with 414 additions and 753 deletions.
9 changes: 5 additions & 4 deletions .gitignore
Expand Up @@ -22,7 +22,7 @@ db/*.sqlite3
/tmp/*

# configuration file introduced in Rails 4.1
/config/secrets.yml
# /config/secrets.yml

# various artifacts
**.war
Expand All @@ -32,7 +32,7 @@ db/*.sqlite3
.redcar/
.sass-cache
/config/config.yml
/config/database.yml
# /config/database.yml
/coverage.data
/coverage/
/db/*.javadb/
Expand Down Expand Up @@ -78,5 +78,6 @@ pickle-email-*.html
# vim artifacts
**.swp

# Ignore application configuration
/config/application.yml
# Environment files that may contain sensitive data
.env
.powenv
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
2.1.0
2.1.1
12 changes: 6 additions & 6 deletions Gemfile
@@ -1,17 +1,17 @@
source 'https://rubygems.org'
ruby '2.1.0'
gem 'rails', '4.0.2'
ruby '2.1.1'
gem 'rails', '4.1.0.rc1'
gem 'sqlite3'
gem 'sass-rails', '~> 4.0.0'
gem 'sass-rails', '~> 4.0.1'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'jquery-rails'
gem 'turbolinks'
gem 'jbuilder', '~> 1.2'
gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'spring', group: :development
gem 'bootstrap-sass', '>= 3.0.0.0'
gem 'figaro'
gem 'high_voltage'
gem 'simple_form'
group :development do
gem 'better_errors'
gem 'binding_of_caller', :platforms=>[:mri_19, :mri_20, :rbx]
Expand Down
111 changes: 58 additions & 53 deletions Gemfile.lock
@@ -1,40 +1,42 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.2)
actionpack (= 4.0.2)
actionmailer (4.1.0.rc1)
actionpack (= 4.1.0.rc1)
actionview (= 4.1.0.rc1)
mail (~> 2.5.4)
actionpack (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
erubis (~> 2.7.0)
actionpack (4.1.0.rc1)
actionview (= 4.1.0.rc1)
activesupport (= 4.1.0.rc1)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
activerecord (4.0.2)
activemodel (= 4.0.2)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.2)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.2)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
actionview (4.1.0.rc1)
activesupport (= 4.1.0.rc1)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.0.rc1)
activesupport (= 4.1.0.rc1)
builder (~> 3.1)
activerecord (4.1.0.rc1)
activemodel (= 4.1.0.rc1)
activesupport (= 4.1.0.rc1)
arel (~> 5.0.0)
activesupport (4.1.0.rc1)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
arel (4.0.2)
atomic (1.1.14)
tzinfo (~> 1.1)
arel (5.0.0)
atomic (1.1.15)
better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.1.0.2)
bootstrap-sass (3.1.1.0)
sass (~> 3.2)
builder (3.1.4)
builder (3.2.2)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
Expand All @@ -46,13 +48,10 @@ GEM
debug_inspector (0.0.2)
erubis (2.7.0)
execjs (2.0.2)
figaro (0.7.0)
bundler (~> 1.0)
rails (>= 3, < 5)
high_voltage (2.1.0)
hike (1.2.3)
i18n (0.6.9)
jbuilder (1.5.3)
jbuilder (2.0.3)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
jquery-rails (3.1.0)
Expand All @@ -63,38 +62,43 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
minitest (4.7.5)
minitest (5.3.0)
multi_json (1.8.4)
polyglot (0.3.3)
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.0.2)
actionmailer (= 4.0.2)
actionpack (= 4.0.2)
activerecord (= 4.0.2)
activesupport (= 4.0.2)
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)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.2)
railties (= 4.1.0.rc1)
sprockets-rails (~> 2.0.0)
rails_layout (1.0.5)
railties (4.0.2)
actionpack (= 4.0.2)
activesupport (= 4.0.2)
rails_layout (1.0.10)
railties (4.1.0.rc1)
actionpack (= 4.1.0.rc1)
activesupport (= 4.1.0.rc1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.1)
rdoc (4.1.1)
json (~> 1.4)
sass (3.2.14)
sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
simple_form (3.0.1)
actionpack (>= 4.0.0, < 4.1)
activemodel (>= 4.0.0, < 4.1)
sprockets (2.10.1)
sdoc (0.4.0)
json (~> 1.8)
rdoc (~> 4.0, < 5.0)
spring (1.1.2)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand All @@ -103,17 +107,18 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.8)
sqlite3 (1.3.9)
thor (0.18.1)
thread_safe (0.1.3)
atomic
thread_safe (0.2.0)
atomic (>= 1.1.7, < 2)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbolinks (2.2.1)
coffee-rails
tzinfo (0.3.38)
tzinfo (1.1.0)
thread_safe (~> 0.1)
uglifier (2.4.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
Expand All @@ -126,15 +131,15 @@ DEPENDENCIES
binding_of_caller
bootstrap-sass (>= 3.0.0.0)
coffee-rails (~> 4.0.0)
figaro
high_voltage
jbuilder (~> 1.2)
jbuilder (~> 2.0)
jquery-rails
quiet_assets
rails (= 4.0.2)
rails (= 4.1.0.rc1)
rails_layout
sass-rails (~> 4.0.0)
simple_form
sass-rails (~> 4.0.1)
sdoc (~> 0.4.0)
spring
sqlite3
turbolinks
uglifier (>= 1.3.0)
63 changes: 51 additions & 12 deletions README
@@ -1,19 +1,58 @@
Rails + Twitter Bootstrap
============================================
Rails Bootstrap
========================

You can use this project as a starting point for a Rails web application. It requires Rails 4 and integrates Twitter Bootstrap.

Twitter Bootstrap
http://twitter.github.com/bootstrap/
This application was generated with the rails_apps_composer gem:
https://github.com/RailsApps/rails_apps_composer
provided by the RailsApps Project:
http://railsapps.github.io/

________________________

For more information, please see the updated README file on GitHub:

https://github.com/railsapps/rails-bootstrap
Recipes:

* apps4
* controllers
* core
* email
* extras
* frontend
* gems
* git
* init
* models
* prelaunch
* railsapps
* readme
* routes
* saas
* setup
* testing
* views

Preferences:

* git: true
* apps4: rails-bootstrap
* database: default
* unit_test: false
* integration: false
* fixtures: false
* frontend: bootstrap3
* email: none
* authentication: false
* devise_modules: false
* authorization: false
* starter_app: false
* form_builder: false
* quiet_assets: true
* local_env_file: false
* better_errors: true
* dev_webserver: webrick
* prod_webserver: same
* templates: erb
* continuous_testing: none
* rvmrc: true

________________________

MIT License

http://www.opensource.org/licenses/mit-license
License

0 comments on commit 95f890d

Please sign in to comment.