Skip to content

Commit 42a0de9

Browse files
committed
build using rails_apps_composer 2.2.20
1 parent 715a902 commit 42a0de9

File tree

4 files changed

+70
-71
lines changed

4 files changed

+70
-71
lines changed

.gitignore

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
# See http://help.github.com/ignore-files/ for more about ignoring files.
55
#
66
# The original version of this file is found here:
7-
# https://github.com/RailsApps/rails3-application-templates/raw/master/files/gitignore.txt
7+
# https://github.com/RailsApps/rails-composer/blob/master/files/gitignore.txt
88
#
99
# Corrections? Improvements? Create a GitHub issue:
10-
# http://github.com/RailsApps/rails3-application-templates/issues
10+
# http://github.com/RailsApps/rails-composer/issues
1111
#----------------------------------------------------------------------------
1212

1313
# bundler state
1414
/.bundle
1515
/vendor/bundle/
16+
/vendor/ruby/
1617

1718
# minimal Rails specific artifacts
1819
db/*.sqlite3
@@ -44,9 +45,6 @@ db/*.sqlite3
4445
/capybara*
4546
/capybara-*.html
4647
/gems
47-
/spec/requests
48-
/spec/routing
49-
/spec/views
5048
/specifications
5149
rerun.txt
5250
pickle-email-*.html

Gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
source 'https://rubygems.org'
2-
gem 'rails', '3.2.8'
2+
gem 'rails', '3.2.9'
33
gem 'sqlite3'
44
group :assets do
55
gem 'sass-rails', '~> 3.2.3'
66
gem 'coffee-rails', '~> 3.2.1'
77
gem 'uglifier', '>= 1.0.3'
88
end
99
gem 'jquery-rails'
10-
gem "rspec-rails", ">= 2.11.0", :group => [:development, :test]
11-
gem "email_spec", ">= 1.2.1", :group => :test
10+
gem "rspec-rails", ">= 2.11.4", :group => [:development, :test]
11+
gem "database_cleaner", ">= 0.9.1", :group => :test
12+
gem "email_spec", ">= 1.4.0", :group => :test
1213
gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
13-
gem "database_cleaner", ">= 0.8.0", :group => :test
1414
gem "launchy", ">= 2.1.2", :group => :test
15-
gem "capybara", ">= 1.1.2", :group => :test
15+
gem "capybara", ">= 1.1.4", :group => :test
1616
gem "factory_girl_rails", ">= 4.1.0", :group => [:development, :test]
1717
gem "devise", ">= 2.1.2"
1818
gem "quiet_assets", ">= 1.0.1", :group => :development

Gemfile.lock

Lines changed: 61 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.2.8)
5-
actionpack (= 3.2.8)
4+
actionmailer (3.2.9)
5+
actionpack (= 3.2.9)
66
mail (~> 2.4.4)
7-
actionpack (3.2.8)
8-
activemodel (= 3.2.8)
9-
activesupport (= 3.2.8)
7+
actionpack (3.2.9)
8+
activemodel (= 3.2.9)
9+
activesupport (= 3.2.9)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
1212
journey (~> 1.0.4)
1313
rack (~> 1.4.0)
1414
rack-cache (~> 1.2)
1515
rack-test (~> 0.6.1)
16-
sprockets (~> 2.1.3)
17-
activemodel (3.2.8)
18-
activesupport (= 3.2.8)
16+
sprockets (~> 2.2.1)
17+
activemodel (3.2.9)
18+
activesupport (= 3.2.9)
1919
builder (~> 3.0.0)
20-
activerecord (3.2.8)
21-
activemodel (= 3.2.8)
22-
activesupport (= 3.2.8)
20+
activerecord (3.2.9)
21+
activemodel (= 3.2.9)
22+
activesupport (= 3.2.9)
2323
arel (~> 3.0.2)
2424
tzinfo (~> 0.3.29)
25-
activeresource (3.2.8)
26-
activemodel (= 3.2.8)
27-
activesupport (= 3.2.8)
28-
activesupport (3.2.8)
25+
activeresource (3.2.9)
26+
activemodel (= 3.2.9)
27+
activesupport (= 3.2.9)
28+
activesupport (3.2.9)
2929
i18n (~> 0.6)
3030
multi_json (~> 1.0)
3131
addressable (2.3.2)
3232
arel (3.0.2)
3333
bcrypt-ruby (3.0.1)
34-
builder (3.0.3)
35-
capybara (1.1.2)
34+
builder (3.0.4)
35+
capybara (2.0.1)
3636
mime-types (>= 1.16)
3737
nokogiri (>= 1.3.3)
3838
rack (>= 1.0.0)
3939
rack-test (>= 0.5.4)
4040
selenium-webdriver (~> 2.0)
41-
xpath (~> 0.1.4)
42-
childprocess (0.3.5)
41+
xpath (~> 1.0.0)
42+
childprocess (0.3.6)
4343
ffi (~> 1.0, >= 1.0.6)
4444
coffee-rails (3.2.2)
4545
coffee-script (>= 2.2.0)
4646
railties (~> 3.2.0)
4747
coffee-script (2.2.0)
4848
coffee-script-source
4949
execjs
50-
coffee-script-source (1.3.3)
50+
coffee-script-source (1.4.0)
5151
cucumber (1.2.1)
5252
builder (>= 2.1.2)
5353
diff-lcs (>= 1.1.3)
@@ -64,9 +64,9 @@ GEM
6464
railties (~> 3.1)
6565
warden (~> 1.2.1)
6666
diff-lcs (1.1.3)
67-
email_spec (1.2.1)
67+
email_spec (1.4.0)
68+
launchy (~> 2.1)
6869
mail (~> 2.2)
69-
rspec (~> 2.0)
7070
erubis (2.7.0)
7171
execjs (1.4.0)
7272
multi_json (~> 1.0)
@@ -75,26 +75,27 @@ GEM
7575
factory_girl_rails (4.1.0)
7676
factory_girl (~> 4.1.0)
7777
railties (>= 3.0.0)
78-
ffi (1.1.5)
79-
gherkin (2.11.4)
78+
ffi (1.2.0)
79+
gherkin (2.11.5)
8080
json (>= 1.4.6)
8181
hike (1.2.1)
8282
i18n (0.6.1)
8383
journey (1.0.4)
84-
jquery-rails (2.1.3)
85-
railties (>= 3.1.0, < 5.0)
86-
thor (~> 0.14)
84+
jquery-rails (2.1.4)
85+
railties (>= 3.0, < 5.0)
86+
thor (>= 0.14, < 2.0)
8787
json (1.7.5)
8888
launchy (2.1.2)
8989
addressable (~> 2.3)
90-
libwebsocket (0.1.5)
90+
libwebsocket (0.1.7.1)
9191
addressable
92+
websocket
9293
mail (2.4.4)
9394
i18n (>= 0.4.0)
9495
mime-types (~> 1.16)
9596
treetop (~> 1.4.8)
9697
mime-types (1.19)
97-
multi_json (1.3.6)
98+
multi_json (1.4.0)
9899
nokogiri (1.5.5)
99100
orm_adapter (0.4.0)
100101
polyglot (0.3.3)
@@ -107,83 +108,83 @@ GEM
107108
rack
108109
rack-test (0.6.2)
109110
rack (>= 1.0)
110-
rails (3.2.8)
111-
actionmailer (= 3.2.8)
112-
actionpack (= 3.2.8)
113-
activerecord (= 3.2.8)
114-
activeresource (= 3.2.8)
115-
activesupport (= 3.2.8)
111+
rails (3.2.9)
112+
actionmailer (= 3.2.9)
113+
actionpack (= 3.2.9)
114+
activerecord (= 3.2.9)
115+
activeresource (= 3.2.9)
116+
activesupport (= 3.2.9)
116117
bundler (~> 1.0)
117-
railties (= 3.2.8)
118-
railties (3.2.8)
119-
actionpack (= 3.2.8)
120-
activesupport (= 3.2.8)
118+
railties (= 3.2.9)
119+
railties (3.2.9)
120+
actionpack (= 3.2.9)
121+
activesupport (= 3.2.9)
121122
rack-ssl (~> 1.3.2)
122123
rake (>= 0.8.7)
123124
rdoc (~> 3.4)
124125
thor (>= 0.14.6, < 2.0)
125-
rake (0.9.2.2)
126+
rake (10.0.2)
126127
rdoc (3.12)
127128
json (~> 1.4)
128-
rspec (2.11.0)
129-
rspec-core (~> 2.11.0)
130-
rspec-expectations (~> 2.11.0)
131-
rspec-mocks (~> 2.11.0)
132-
rspec-core (2.11.1)
133-
rspec-expectations (2.11.3)
129+
rspec-core (2.12.1)
130+
rspec-expectations (2.12.0)
134131
diff-lcs (~> 1.1.3)
135-
rspec-mocks (2.11.3)
136-
rspec-rails (2.11.0)
132+
rspec-mocks (2.12.0)
133+
rspec-rails (2.12.0)
137134
actionpack (>= 3.0)
138135
activesupport (>= 3.0)
139136
railties (>= 3.0)
140-
rspec (~> 2.11.0)
137+
rspec-core (~> 2.12.0)
138+
rspec-expectations (~> 2.12.0)
139+
rspec-mocks (~> 2.12.0)
141140
rubyzip (0.9.9)
142-
sass (3.2.1)
141+
sass (3.2.3)
143142
sass-rails (3.2.5)
144143
railties (~> 3.2.0)
145144
sass (>= 3.1.10)
146145
tilt (~> 1.3)
147-
selenium-webdriver (2.25.0)
146+
selenium-webdriver (2.27.1)
148147
childprocess (>= 0.2.5)
149148
libwebsocket (~> 0.1.3)
150149
multi_json (~> 1.0)
151150
rubyzip
152-
sprockets (2.1.3)
151+
sprockets (2.2.2)
153152
hike (~> 1.2)
153+
multi_json (~> 1.0)
154154
rack (~> 1.0)
155155
tilt (~> 1.1, != 1.3.0)
156156
sqlite3 (1.3.6)
157157
thor (0.16.0)
158158
tilt (1.3.3)
159-
treetop (1.4.11)
159+
treetop (1.4.12)
160160
polyglot
161161
polyglot (>= 0.3.1)
162-
tzinfo (0.3.33)
162+
tzinfo (0.3.35)
163163
uglifier (1.3.0)
164164
execjs (>= 0.3.0)
165165
multi_json (~> 1.0, >= 1.0.2)
166166
warden (1.2.1)
167167
rack (>= 1.0)
168-
xpath (0.1.4)
168+
websocket (1.0.4)
169+
xpath (1.0.0)
169170
nokogiri (~> 1.3)
170171

171172
PLATFORMS
172173
ruby
173174

174175
DEPENDENCIES
175-
capybara (>= 1.1.2)
176+
capybara (>= 1.1.4)
176177
coffee-rails (~> 3.2.1)
177178
cucumber-rails (>= 1.3.0)
178-
database_cleaner (>= 0.8.0)
179+
database_cleaner (>= 0.9.1)
179180
devise (>= 2.1.2)
180-
email_spec (>= 1.2.1)
181+
email_spec (>= 1.4.0)
181182
factory_girl_rails (>= 4.1.0)
182183
jquery-rails
183184
launchy (>= 2.1.2)
184185
quiet_assets (>= 1.0.1)
185-
rails (= 3.2.8)
186-
rspec-rails (>= 2.11.0)
186+
rails (= 3.2.9)
187+
rspec-rails (>= 2.11.4)
187188
sass-rails (~> 3.2.3)
188189
sqlite3
189190
uglifier (>= 1.0.3)

app/views/layouts/application.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<%= csrf_meta_tags %>
1010
<%= yield(:head) %>
1111
</head>
12-
<body>
12+
<body class="<%= controller_name %> <%= action_name %>">
1313
<div id="container" class="container">
1414
<header>
1515
<%= render 'layouts/navigation' %>

0 commit comments

Comments
 (0)