bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Merge branch 'release/1.0.0'

Browse Source
This commit is contained in:
Cesidio Di Landa 2013-06-25 17:29:53 +02:00
commit 67b6888e7b
8 changed files with 47 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,6 +1,10 @@
Changelog Changelog
========= =========
1.0.0
-----
* Rails 4
0.6.1 0.6.1
----- -----
* Added rails_12factor gem * Added rails_12factor gem

13
Gemfile
View File

@ -1,14 +1,14 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '2.0.0' ruby '2.0.0'
gem 'rails', '4.0.0.rc2' gem 'rails', '4.0.0'
# Servers # Servers
gem 'puma' gem 'puma'
gem 'unicorn' gem 'unicorn'
# Multi-environment configuration # Multi-environment configuration
gem 'simpleconfig' # gem 'simpleconfig'
# API # API
# gem 'rabl' # gem 'rabl'
@ -26,20 +26,19 @@ gem 'pg'
# Miscellanea # Miscellanea
# gem 'google-analytics-rails' # gem 'google-analytics-rails'
gem 'haml' gem 'haml'
gem 'http_accept_language' # gem 'http_accept_language'
gem 'jquery-rails' gem 'jquery-rails'
gem 'nokogiri' gem 'nokogiri'
gem 'resque', require: 'resque/server' # Resque web interface # gem 'resque', require: 'resque/server' # Resque web interface
gem 'rest-client'
# Assets # Assets
gem 'coffee-rails', '~> 4.0.0' gem 'coffee-rails', '~> 4.0.0'
gem 'haml_assets' gem 'haml_assets'
gem 'handlebars_assets' # gem 'handlebars_assets'
gem 'i18n-js' gem 'i18n-js'
gem 'jquery-turbolinks' gem 'jquery-turbolinks'
gem 'less-rails' gem 'less-rails'
gem 'sass-rails', '~> 4.0.0.rc2' gem 'sass-rails', '~> 4.0.0'
gem 'therubyracer' gem 'therubyracer'
gem 'turbolinks' gem 'turbolinks'
gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.2.1' gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.2.1'

77
Gemfile.lock
View File

@ -12,25 +12,25 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.0.0.rc2) actionmailer (4.0.0)
actionpack (= 4.0.0.rc2) actionpack (= 4.0.0)
mail (~> 2.5.3) mail (~> 2.5.3)
actionpack (4.0.0.rc2) actionpack (4.0.0)
activesupport (= 4.0.0.rc2) activesupport (= 4.0.0)
builder (~> 3.1.0) builder (~> 3.1.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
activemodel (4.0.0.rc2) activemodel (4.0.0)
activesupport (= 4.0.0.rc2) activesupport (= 4.0.0)
builder (~> 3.1.0) builder (~> 3.1.0)
activerecord (4.0.0.rc2) activerecord (4.0.0)
activemodel (= 4.0.0.rc2) activemodel (= 4.0.0)
activerecord-deprecated_finders (~> 1.0.2) activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0.rc2) activesupport (= 4.0.0)
arel (~> 4.0.0) arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3) activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0.rc2) activesupport (4.0.0)
i18n (~> 0.6, >= 0.6.4) i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2) minitest (~> 4.2)
multi_json (~> 1.3) multi_json (~> 1.3)
@ -106,12 +106,7 @@ GEM
haml_assets (0.2.2) haml_assets (0.2.2)
haml haml
tilt tilt
handlebars_assets (0.14.0)
execjs (>= 1.2.9)
sprockets (>= 2.0.3)
tilt
hike (1.2.3) hike (1.2.3)
http_accept_language (1.0.2)
i18n (0.6.4) i18n (0.6.4)
i18n-js (2.1.2) i18n-js (2.1.2)
i18n i18n
@ -133,15 +128,14 @@ GEM
mail (2.5.4) mail (2.5.4)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
meta_request (0.2.6) meta_request (0.2.7)
callsite callsite
rack-contrib rack-contrib
railties railties
method_source (0.8.1) method_source (0.8.1)
mime-types (1.23) mime-types (1.23)
mini_portile (0.5.0) mini_portile (0.5.0)
minitest (4.7.4) minitest (4.7.5)
mono_logger (1.1.0)
multi_json (1.7.7) multi_json (1.7.7)
nokogiri (1.6.0) nokogiri (1.6.0)
mini_portile (~> 0.5.0) mini_portile (~> 0.5.0)
@ -158,40 +152,29 @@ GEM
rack (1.5.2) rack (1.5.2)
rack-contrib (1.1.0) rack-contrib (1.1.0)
rack (>= 0.9.1) rack (>= 0.9.1)
rack-protection (1.5.0)
rack
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.0.0.rc2) rails (4.0.0)
actionmailer (= 4.0.0.rc2) actionmailer (= 4.0.0)
actionpack (= 4.0.0.rc2) actionpack (= 4.0.0)
activerecord (= 4.0.0.rc2) activerecord (= 4.0.0)
activesupport (= 4.0.0.rc2) activesupport (= 4.0.0)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0.rc2) railties (= 4.0.0)
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0.0)
rails_12factor (0.0.2) rails_12factor (0.0.2)
rails_serve_static_assets rails_serve_static_assets
rails_stdout_logging rails_stdout_logging
rails_serve_static_assets (0.0.1) rails_serve_static_assets (0.0.1)
rails_stdout_logging (0.0.1) rails_stdout_logging (0.0.1)
railties (4.0.0.rc2) railties (4.0.0)
actionpack (= 4.0.0.rc2) actionpack (= 4.0.0)
activesupport (= 4.0.0.rc2) activesupport (= 4.0.0)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
raindrops (0.11.0) raindrops (0.11.0)
rake (10.1.0) rake (10.1.0)
redis (3.0.4)
redis-namespace (1.3.0)
redis (~> 3.0.0)
ref (1.0.5) 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) rest-client (1.6.7)
mime-types (>= 1.16) mime-types (>= 1.16)
rspec (2.13.0) rspec (2.13.0)
@ -212,7 +195,7 @@ GEM
rubyzip (0.9.9) rubyzip (0.9.9)
safe_yaml (0.9.3) safe_yaml (0.9.3)
sass (3.2.9) sass (3.2.9)
sass-rails (4.0.0.rc2) sass-rails (4.0.0)
railties (>= 4.0.0.beta, < 5.0) railties (>= 4.0.0.beta, < 5.0)
sass (>= 3.1.10) sass (>= 3.1.10)
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0.0)
@ -221,15 +204,10 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
websocket (~> 1.0.4) websocket (~> 1.0.4)
simpleconfig (2.0.1)
simplecov (0.7.1) simplecov (0.7.1)
multi_json (~> 1.0) multi_json (~> 1.0)
simplecov-html (~> 0.7.1) simplecov-html (~> 0.7.1)
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) slop (3.4.5)
sprockets (2.10.0) sprockets (2.10.0)
hike (~> 1.2) hike (~> 1.2)
@ -261,8 +239,6 @@ GEM
rack rack
raindrops (~> 0.7) raindrops (~> 0.7)
uniform_notifier (1.2.0) uniform_notifier (1.2.0)
vegas (0.1.11)
rack (>= 1.0.0)
webmock (1.11.0) webmock (1.11.0)
addressable (>= 2.2.7) addressable (>= 2.2.7)
crack (>= 0.3.2) crack (>= 0.3.2)
@ -288,8 +264,6 @@ DEPENDENCIES
faker faker
haml haml
haml_assets haml_assets
handlebars_assets
http_accept_language
i18n-js i18n-js
jquery-rails jquery-rails
jquery-turbolinks jquery-turbolinks
@ -301,15 +275,12 @@ DEPENDENCIES
pry pry
pry-rails pry-rails
puma puma
rails (= 4.0.0.rc2) rails (= 4.0.0)
rails_12factor rails_12factor
resque
rest-client
rspec rspec
rspec-rails rspec-rails
sass-rails (~> 4.0.0.rc2) sass-rails (~> 4.0.0)
selenium-webdriver selenium-webdriver
simpleconfig
simplecov simplecov
therubyracer therubyracer
turbolinks turbolinks

2
README.md
View File

@ -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: This is a starter web application based on the following technology stack:
* Ruby 2 * Ruby 2
* Rails 4.0.0.rc2 * Rails 4.0.0
* PostgreSQL * PostgreSQL
* RSpec * RSpec
* Twitter Bootstrap * Twitter Bootstrap

2
VERSION
View File

@ -1 +1 @@
0.6.1 1.0.0

4
app/assets/javascripts/application.js.coffee.erb
View File

@ -6,8 +6,8 @@
# FRONT END # FRONT END
#= require twitter/bootstrap #= require twitter/bootstrap
# JS TEMPLATES # JS HANDLEBARS TEMPLATES
#= require handlebars.runtime # require handlebars.runtime
# I18n # I18n
#= require i18n #= require i18n

6
app/views/pages/home.html.haml
View File

@ -1,6 +1,6 @@
- title t('hello') - title t('hello')
%h1 %h1
%i.icon-gear %i.icon-ticket
Top Gear Ticket to Ride
%p.lead.muted %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

7
app/views/shared/_footer.html.haml
View File

@ -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