Skip to content

Commit b3135ab

Browse files
committed
conform to app generated by version 1.3.0 of rails_apps_composer
1 parent 9692830 commit b3135ab

File tree

17 files changed

+96
-160
lines changed

17 files changed

+96
-160
lines changed

Gemfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
source 'https://rubygems.org'
2-
gem 'rails', '3.2.1'
2+
gem 'rails', '3.2.2'
33
gem 'sqlite3'
44
group :assets do
55
gem 'sass-rails', '~> 3.2.3'
66
gem 'coffee-rails', '~> 3.2.1'
7-
8-
97
gem 'uglifier', '>= 1.0.3'
108
end
119
gem 'jquery-rails'
12-
gem "rspec-rails", ">= 2.8.1", :group => [:development, :test]
13-
gem "factory_girl_rails", ">= 1.7.0", :group => :test
10+
gem "rspec-rails", ">= 2.9.0.rc2", :group => [:development, :test]
11+
gem "factory_girl_rails", ">= 2.0.0.rc", :group => [:development, :test]
1412
gem "email_spec", ">= 1.2.1", :group => :test
1513
gem "cucumber-rails", ">= 1.3.0", :group => :test
1614
gem "capybara", ">= 1.1.2", :group => :test
1715
gem "database_cleaner", ">= 0.7.1", :group => :test
1816
gem "launchy", ">= 2.0.5", :group => :test
19-
gem "devise", ">= 2.0.4"
17+
gem "devise", ">= 2.1.0.rc"

Gemfile.lock

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.2.1)
5-
actionpack (= 3.2.1)
4+
actionmailer (3.2.2)
5+
actionpack (= 3.2.2)
66
mail (~> 2.4.0)
7-
actionpack (3.2.1)
8-
activemodel (= 3.2.1)
9-
activesupport (= 3.2.1)
7+
actionpack (3.2.2)
8+
activemodel (= 3.2.2)
9+
activesupport (= 3.2.2)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
1212
journey (~> 1.0.1)
1313
rack (~> 1.4.0)
1414
rack-cache (~> 1.1)
1515
rack-test (~> 0.6.1)
1616
sprockets (~> 2.1.2)
17-
activemodel (3.2.1)
18-
activesupport (= 3.2.1)
17+
activemodel (3.2.2)
18+
activesupport (= 3.2.2)
1919
builder (~> 3.0.0)
20-
activerecord (3.2.1)
21-
activemodel (= 3.2.1)
22-
activesupport (= 3.2.1)
23-
arel (~> 3.0.0)
20+
activerecord (3.2.2)
21+
activemodel (= 3.2.2)
22+
activesupport (= 3.2.2)
23+
arel (~> 3.0.2)
2424
tzinfo (~> 0.3.29)
25-
activeresource (3.2.1)
26-
activemodel (= 3.2.1)
27-
activesupport (= 3.2.1)
28-
activesupport (3.2.1)
25+
activeresource (3.2.2)
26+
activemodel (= 3.2.2)
27+
activesupport (= 3.2.2)
28+
activesupport (3.2.2)
2929
i18n (~> 0.6)
3030
multi_json (~> 1.0)
3131
addressable (2.2.7)
@@ -59,7 +59,7 @@ GEM
5959
cucumber (>= 1.1.8)
6060
nokogiri (>= 1.5.0)
6161
database_cleaner (0.7.1)
62-
devise (2.0.4)
62+
devise (2.1.0.rc)
6363
bcrypt-ruby (~> 3.0)
6464
orm_adapter (~> 0.0.3)
6565
railties (~> 3.1)
@@ -71,10 +71,10 @@ GEM
7171
erubis (2.7.0)
7272
execjs (1.3.0)
7373
multi_json (~> 1.0)
74-
factory_girl (2.6.0)
75-
activesupport (>= 2.3.9)
76-
factory_girl_rails (1.7.0)
77-
factory_girl (~> 2.6.0)
74+
factory_girl (3.0.0.rc1)
75+
activesupport (>= 3.0.0)
76+
factory_girl_rails (2.0.0.rc)
77+
factory_girl (~> 3.0.0.rc)
7878
railties (>= 3.0.0)
7979
ffi (1.0.11)
8080
gherkin (2.9.0)
@@ -88,53 +88,53 @@ GEM
8888
json (1.6.5)
8989
launchy (2.0.5)
9090
addressable (~> 2.2.6)
91-
mail (2.4.1)
91+
mail (2.4.4)
9292
i18n (>= 0.4.0)
9393
mime-types (~> 1.16)
9494
treetop (~> 1.4.8)
9595
mime-types (1.17.2)
9696
multi_json (1.1.0)
97-
nokogiri (1.5.0)
97+
nokogiri (1.5.2)
9898
orm_adapter (0.0.6)
9999
polyglot (0.3.3)
100100
rack (1.4.1)
101-
rack-cache (1.1)
101+
rack-cache (1.2)
102102
rack (>= 0.4)
103103
rack-ssl (1.3.2)
104104
rack
105105
rack-test (0.6.1)
106106
rack (>= 1.0)
107-
rails (3.2.1)
108-
actionmailer (= 3.2.1)
109-
actionpack (= 3.2.1)
110-
activerecord (= 3.2.1)
111-
activeresource (= 3.2.1)
112-
activesupport (= 3.2.1)
107+
rails (3.2.2)
108+
actionmailer (= 3.2.2)
109+
actionpack (= 3.2.2)
110+
activerecord (= 3.2.2)
111+
activeresource (= 3.2.2)
112+
activesupport (= 3.2.2)
113113
bundler (~> 1.0)
114-
railties (= 3.2.1)
115-
railties (3.2.1)
116-
actionpack (= 3.2.1)
117-
activesupport (= 3.2.1)
114+
railties (= 3.2.2)
115+
railties (3.2.2)
116+
actionpack (= 3.2.2)
117+
activesupport (= 3.2.2)
118118
rack-ssl (~> 1.3.2)
119119
rake (>= 0.8.7)
120120
rdoc (~> 3.4)
121121
thor (~> 0.14.6)
122122
rake (0.9.2.2)
123123
rdoc (3.12)
124124
json (~> 1.4)
125-
rspec (2.8.0)
126-
rspec-core (~> 2.8.0)
127-
rspec-expectations (~> 2.8.0)
128-
rspec-mocks (~> 2.8.0)
129-
rspec-core (2.8.0)
130-
rspec-expectations (2.8.0)
131-
diff-lcs (~> 1.1.2)
132-
rspec-mocks (2.8.0)
133-
rspec-rails (2.8.1)
125+
rspec (2.9.0.rc2)
126+
rspec-core (= 2.9.0.rc2)
127+
rspec-expectations (= 2.9.0.rc2)
128+
rspec-mocks (= 2.9.0.rc2)
129+
rspec-core (2.9.0.rc2)
130+
rspec-expectations (2.9.0.rc2)
131+
diff-lcs (~> 1.1.3)
132+
rspec-mocks (2.9.0.rc2)
133+
rspec-rails (2.9.0.rc2)
134134
actionpack (>= 3.0)
135135
activesupport (>= 3.0)
136136
railties (>= 3.0)
137-
rspec (~> 2.8.0)
137+
rspec (= 2.9.0.rc2)
138138
rubyzip (0.9.6.1)
139139
sass (3.1.15)
140140
sass-rails (3.2.4)
@@ -157,7 +157,7 @@ GEM
157157
treetop (1.4.10)
158158
polyglot
159159
polyglot (>= 0.3.1)
160-
tzinfo (0.3.31)
160+
tzinfo (0.3.32)
161161
uglifier (1.2.3)
162162
execjs (>= 0.3.0)
163163
multi_json (>= 1.0.2)
@@ -174,13 +174,13 @@ DEPENDENCIES
174174
coffee-rails (~> 3.2.1)
175175
cucumber-rails (>= 1.3.0)
176176
database_cleaner (>= 0.7.1)
177-
devise (>= 2.0.4)
177+
devise (>= 2.1.0.rc)
178178
email_spec (>= 1.2.1)
179-
factory_girl_rails (>= 1.7.0)
179+
factory_girl_rails (>= 2.0.0.rc)
180180
jquery-rails
181181
launchy (>= 2.0.5)
182-
rails (= 3.2.1)
183-
rspec-rails (>= 2.8.1)
182+
rails (= 3.2.2)
183+
rspec-rails (>= 2.9.0.rc2)
184184
sass-rails (~> 3.2.3)
185185
sqlite3
186186
uglifier (>= 1.0.3)

app/assets/stylesheets/application.css.scss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111
*= require_self
1212
*= require_tree .
1313
*/
14-
15-
header nav ul {
14+
.brand {
15+
float: left;
16+
padding-right: 8px;
17+
}
18+
ul.nav {
1619
list-style: none;
1720
margin: 0 0 2em;
1821
padding: 0;
1922
}
20-
header nav ul li {
23+
ul.nav li {
2124
display: inline;
2225
}
2326
#flash_notice, #flash_alert {
@@ -32,4 +35,3 @@ header nav ul li {
3235
background-color: #FCC;
3336
border: solid 1px #C66;
3437
}
35-

app/views/devise/confirmations/new.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
<div><%= f.submit "Resend confirmation instructions" %></div>
1010
<% end %>
1111

12-
<%= render "links" %>
12+
<%= render :partial => "devise/shared/links" %>

app/views/devise/passwords/edit.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
<div><%= f.submit "Change my password" %></div>
1414
<% end %>
1515

16-
<%= render "links" %>
16+
<%= render :partial => "devise/shared/links" %>

app/views/devise/passwords/new.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
<div><%= f.submit "Send me reset password instructions" %></div>
1010
<% end %>
1111

12-
<%= render "links" %>
12+
<%= render :partial => "devise/shared/links" %>

app/views/devise/registrations/new.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
<div><%= f.submit "Sign up" %></div>
1818
<% end %>
1919

20-
<%= render "links" %>
20+
<%= render :partial => "devise/shared/links" %>

app/views/devise/sessions/new.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
<div><%= f.submit "Sign in" %></div>
1515
<% end %>
1616

17-
<%= render "links" %>
17+
<%= render :partial => "devise/shared/links" %>

app/views/devise/unlocks/new.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
<div><%= f.submit "Resend unlock instructions" %></div>
1010
<% end %>
1111

12-
<%= render "links" %>
12+
<%= render :partial => "devise/shared/links" %>

0 commit comments

Comments
 (0)