Skip to content

Commit 379b6c0

Browse files
committed
build using rails_apps_composer 2.6.1
1 parent 27adb77 commit 379b6c0

File tree

7 files changed

+12
-20
lines changed

7 files changed

+12
-20
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ db/*.sqlite3
2525
**.war
2626
*.rbc
2727
*.sassc
28-
.rspec
2928
.redcar/
3029
.sass-cache
3130
/config/config.yml

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ gem 'bootstrap-sass'
1414
gem 'high_voltage'
1515
group :development do
1616
gem 'better_errors'
17-
gem 'binding_of_caller', :platforms=>[:mri_19, :mri_20, :mri_21, :rbx]
17+
gem 'binding_of_caller', :platforms=>[:mri_21]
1818
gem 'quiet_assets'
19+
gem 'rails_apps_pages'
1920
gem 'rails_layout'
2021
end

Gemfile.lock

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ GEM
2727
minitest (~> 5.1)
2828
thread_safe (~> 0.1)
2929
tzinfo (~> 1.1)
30-
arel (5.0.0)
30+
arel (5.0.1.20140414130214)
3131
better_errors (1.1.0)
3232
coderay (>= 1.0.0)
3333
erubis (>= 2.6.6)
3434
binding_of_caller (0.7.2)
3535
debug_inspector (>= 0.0.1)
36-
bootstrap-sass (3.1.1.0)
36+
bootstrap-sass (3.1.1.1)
3737
sass (~> 3.2)
3838
builder (3.2.2)
3939
coderay (1.1.0)
@@ -50,7 +50,7 @@ GEM
5050
high_voltage (2.1.0)
5151
hike (1.2.3)
5252
i18n (0.6.9)
53-
jbuilder (2.0.6)
53+
jbuilder (2.0.7)
5454
activesupport (>= 3.0.0, < 5)
5555
multi_json (~> 1.2)
5656
jquery-rails (3.1.0)
@@ -61,8 +61,8 @@ GEM
6161
mime-types (~> 1.16)
6262
treetop (~> 1.4.8)
6363
mime-types (1.25.1)
64-
minitest (5.3.2)
65-
multi_json (1.9.2)
64+
minitest (5.3.3)
65+
multi_json (1.9.3)
6666
polyglot (0.3.4)
6767
quiet_assets (1.0.2)
6868
railties (>= 3.1, < 5.0)
@@ -79,13 +79,14 @@ GEM
7979
bundler (>= 1.3.0, < 2.0)
8080
railties (= 4.1.0)
8181
sprockets-rails (~> 2.0)
82-
rails_layout (1.0.14)
82+
rails_apps_pages (0.3.1)
83+
rails_layout (1.0.15)
8384
railties (4.1.0)
8485
actionpack (= 4.1.0)
8586
activesupport (= 4.1.0)
8687
rake (>= 0.8.7)
8788
thor (>= 0.18.1, < 2.0)
88-
rake (10.2.2)
89+
rake (10.3.1)
8990
rdoc (4.1.1)
9091
json (~> 1.4)
9192
sass (3.2.19)
@@ -135,6 +136,7 @@ DEPENDENCIES
135136
jquery-rails
136137
quiet_assets
137138
rails (= 4.1.0)
139+
rails_apps_pages
138140
rails_layout
139141
sass-rails (~> 4.0.3)
140142
sdoc (~> 0.4.0)

app/assets/stylesheets/framework_and_overrides.css.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
// Temporary workaround for Rails 4.1.2 pending releaase of bootstrap-sass 3.1.2
2-
//= depend_on_asset "bootstrap/glyphicons-halflings-regular.eot"
3-
//= depend_on_asset "bootstrap/glyphicons-halflings-regular.svg"
4-
//= depend_on_asset "bootstrap/glyphicons-halflings-regular.ttf"
5-
//= depend_on_asset "bootstrap/glyphicons-halflings-regular.woff"
6-
71
// import the CSS framework
82
@import "bootstrap";
93

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
class VisitorsController < ApplicationController
2-
3-
def new
4-
end
5-
62
end

app/views/visitors/index.html.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<h3>Welcome</h3>

app/views/visitors/new.html.erb

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)