diff --git a/CHANGELOG.md b/CHANGELOG.md index 55556c0..d679b2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +1.0.0 +----- +* Rails 4 + 0.6.1 ----- * Added rails_12factor gem diff --git a/Gemfile b/Gemfile index 61069e9..1625bf4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,14 @@ source 'https://rubygems.org' ruby '2.0.0' -gem 'rails', '4.0.0.rc2' +gem 'rails', '4.0.0' # Servers gem 'puma' gem 'unicorn' # Multi-environment configuration -gem 'simpleconfig' +# gem 'simpleconfig' # API # gem 'rabl' @@ -26,20 +26,19 @@ gem 'pg' # Miscellanea # gem 'google-analytics-rails' gem 'haml' -gem 'http_accept_language' +# gem 'http_accept_language' gem 'jquery-rails' gem 'nokogiri' -gem 'resque', require: 'resque/server' # Resque web interface -gem 'rest-client' +# gem 'resque', require: 'resque/server' # Resque web interface # Assets gem 'coffee-rails', '~> 4.0.0' gem 'haml_assets' -gem 'handlebars_assets' +# gem 'handlebars_assets' gem 'i18n-js' gem 'jquery-turbolinks' gem 'less-rails' -gem 'sass-rails', '~> 4.0.0.rc2' +gem 'sass-rails', '~> 4.0.0' gem 'therubyracer' gem 'turbolinks' gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index db4ea1e..a5b0c50 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,25 +12,25 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.0.rc2) - actionpack (= 4.0.0.rc2) + actionmailer (4.0.0) + actionpack (= 4.0.0) mail (~> 2.5.3) - actionpack (4.0.0.rc2) - activesupport (= 4.0.0.rc2) + actionpack (4.0.0) + activesupport (= 4.0.0) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.0.rc2) - activesupport (= 4.0.0.rc2) + activemodel (4.0.0) + activesupport (= 4.0.0) builder (~> 3.1.0) - activerecord (4.0.0.rc2) - activemodel (= 4.0.0.rc2) + activerecord (4.0.0) + activemodel (= 4.0.0) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.0.rc2) + activesupport (= 4.0.0) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.0.rc2) + activesupport (4.0.0) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) @@ -106,12 +106,7 @@ GEM haml_assets (0.2.2) haml tilt - handlebars_assets (0.14.0) - execjs (>= 1.2.9) - sprockets (>= 2.0.3) - tilt hike (1.2.3) - http_accept_language (1.0.2) i18n (0.6.4) i18n-js (2.1.2) i18n @@ -133,15 +128,14 @@ GEM mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - meta_request (0.2.6) + meta_request (0.2.7) callsite rack-contrib railties method_source (0.8.1) mime-types (1.23) mini_portile (0.5.0) - minitest (4.7.4) - mono_logger (1.1.0) + minitest (4.7.5) multi_json (1.7.7) nokogiri (1.6.0) mini_portile (~> 0.5.0) @@ -158,40 +152,29 @@ GEM rack (1.5.2) rack-contrib (1.1.0) rack (>= 0.9.1) - rack-protection (1.5.0) - rack rack-test (0.6.2) rack (>= 1.0) - rails (4.0.0.rc2) - actionmailer (= 4.0.0.rc2) - actionpack (= 4.0.0.rc2) - activerecord (= 4.0.0.rc2) - activesupport (= 4.0.0.rc2) + rails (4.0.0) + actionmailer (= 4.0.0) + actionpack (= 4.0.0) + activerecord (= 4.0.0) + activesupport (= 4.0.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0.rc2) + railties (= 4.0.0) sprockets-rails (~> 2.0.0) rails_12factor (0.0.2) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.1) rails_stdout_logging (0.0.1) - railties (4.0.0.rc2) - actionpack (= 4.0.0.rc2) - activesupport (= 4.0.0.rc2) + railties (4.0.0) + actionpack (= 4.0.0) + activesupport (= 4.0.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.11.0) rake (10.1.0) - redis (3.0.4) - redis-namespace (1.3.0) - redis (~> 3.0.0) ref (1.0.5) - resque (1.24.1) - mono_logger (~> 1.0) - multi_json (~> 1.0) - redis-namespace (~> 1.2) - sinatra (>= 0.9.2) - vegas (~> 0.1.2) rest-client (1.6.7) mime-types (>= 1.16) rspec (2.13.0) @@ -212,7 +195,7 @@ GEM rubyzip (0.9.9) safe_yaml (0.9.3) sass (3.2.9) - sass-rails (4.0.0.rc2) + sass-rails (4.0.0) railties (>= 4.0.0.beta, < 5.0) sass (>= 3.1.10) sprockets-rails (~> 2.0.0) @@ -221,15 +204,10 @@ GEM multi_json (~> 1.0) rubyzip websocket (~> 1.0.4) - simpleconfig (2.0.1) simplecov (0.7.1) multi_json (~> 1.0) simplecov-html (~> 0.7.1) simplecov-html (0.7.1) - sinatra (1.4.3) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) slop (3.4.5) sprockets (2.10.0) hike (~> 1.2) @@ -261,8 +239,6 @@ GEM rack raindrops (~> 0.7) uniform_notifier (1.2.0) - vegas (0.1.11) - rack (>= 1.0.0) webmock (1.11.0) addressable (>= 2.2.7) crack (>= 0.3.2) @@ -288,8 +264,6 @@ DEPENDENCIES faker haml haml_assets - handlebars_assets - http_accept_language i18n-js jquery-rails jquery-turbolinks @@ -301,15 +275,12 @@ DEPENDENCIES pry pry-rails puma - rails (= 4.0.0.rc2) + rails (= 4.0.0) rails_12factor - resque - rest-client rspec rspec-rails - sass-rails (~> 4.0.0.rc2) + sass-rails (~> 4.0.0) selenium-webdriver - simpleconfig simplecov therubyracer turbolinks diff --git a/README.md b/README.md index de970b1..6750bfa 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Starter App [![Build Status](https://travis-ci.org/diowa/ruby2-rails4-bootstrap- This is a starter web application based on the following technology stack: * Ruby 2 -* Rails 4.0.0.rc2 +* Rails 4.0.0 * PostgreSQL * RSpec * Twitter Bootstrap diff --git a/VERSION b/VERSION index ee6cdce..3eefcb9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.1 +1.0.0 diff --git a/app/assets/javascripts/application.js.coffee.erb b/app/assets/javascripts/application.js.coffee.erb index d55cdb0..7058f34 100644 --- a/app/assets/javascripts/application.js.coffee.erb +++ b/app/assets/javascripts/application.js.coffee.erb @@ -6,8 +6,8 @@ # FRONT END #= require twitter/bootstrap -# JS TEMPLATES -#= require handlebars.runtime +# JS HANDLEBARS TEMPLATES +# require handlebars.runtime # I18n #= require i18n diff --git a/app/views/pages/home.html.haml b/app/views/pages/home.html.haml index e18fdd1..47af4f6 100644 --- a/app/views/pages/home.html.haml +++ b/app/views/pages/home.html.haml @@ -1,6 +1,6 @@ - title t('hello') %h1 - %i.icon-gear - Top Gear + %i.icon-ticket + Ticket to Ride %p.lead.muted - Ruby 2 + Rails 4.0.0.rc2 + Bootstrap 2.3.2 + Font Awesome 3.2.1 + Ruby 2 + Rails 4.0.0 + Bootstrap 2.3.2 + Font Awesome 3.2.1 diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml index 85811d0..5d9a341 100644 --- a/app/views/shared/_footer.html.haml +++ b/app/views/shared/_footer.html.haml @@ -1 +1,6 @@ -%footer.text-center +%hr +%footer + %p + = link_to 'https://github.com/diowa/ruby2-rails4-bootstrap-heroku' do + %i.icon-github + diowa/ruby2-rails4-bootstrap-heroku