Skip to content

Commit f94c224

Browse files
committed
build using rails_apps_composer 2.2.31
1 parent 98a4820 commit f94c224

File tree

4 files changed

+68
-72
lines changed

4 files changed

+68
-72
lines changed

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ gem "database_cleaner", ">= 0.9.1", :group => :test
1212
gem "email_spec", ">= 1.4.0", :group => :test
1313
gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
1414
gem "launchy", ">= 2.1.2", :group => :test
15-
gem "capybara", ">= 2.0.1", :group => :test
16-
gem "factory_girl_rails", ">= 4.1.0", :group => [:development, :test]
17-
gem "devise", ">= 2.2.2"
15+
gem "capybara", ">= 2.0.2", :group => :test
16+
gem "factory_girl_rails", ">= 4.2.0", :group => [:development, :test]
17+
gem "devise", ">= 2.2.3"
1818
gem "quiet_assets", ">= 1.0.1", :group => :development
1919
gem "figaro", ">= 0.5.3"
2020
gem "better_errors", ">= 0.3.2", :group => :development

Gemfile.lock

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ GEM
4343
rack-test (>= 0.5.4)
4444
selenium-webdriver (~> 2.0)
4545
xpath (~> 1.0.0)
46-
childprocess (0.3.6)
46+
childprocess (0.3.7)
4747
ffi (~> 1.0, >= 1.0.6)
4848
coderay (1.0.8)
4949
coffee-rails (3.2.2)
@@ -63,7 +63,7 @@ GEM
6363
cucumber (>= 1.1.8)
6464
nokogiri (>= 1.5.0)
6565
database_cleaner (0.9.1)
66-
devise (2.2.2)
66+
devise (2.2.3)
6767
bcrypt-ruby (~> 3.0)
6868
orm_adapter (~> 0.1)
6969
railties (~> 3.1)
@@ -75,16 +75,16 @@ GEM
7575
erubis (2.7.0)
7676
execjs (1.4.0)
7777
multi_json (~> 1.0)
78-
factory_girl (4.1.0)
78+
factory_girl (4.2.0)
7979
activesupport (>= 3.0.0)
80-
factory_girl_rails (4.1.0)
81-
factory_girl (~> 4.1.0)
80+
factory_girl_rails (4.2.0)
81+
factory_girl (~> 4.2.0)
8282
railties (>= 3.0.0)
8383
ffi (1.3.1)
8484
figaro (0.5.3)
8585
rails (~> 3.0)
86-
gherkin (2.11.5)
87-
json (>= 1.4.6)
86+
gherkin (2.11.6)
87+
json (>= 1.7.6)
8888
hike (1.2.1)
8989
i18n (0.6.1)
9090
journey (1.0.4)
@@ -94,9 +94,6 @@ GEM
9494
json (1.7.6)
9595
launchy (2.1.2)
9696
addressable (~> 2.3)
97-
libwebsocket (0.1.7.1)
98-
addressable
99-
websocket
10097
mail (2.4.4)
10198
i18n (>= 0.4.0)
10299
mime-types (~> 1.16)
@@ -111,7 +108,7 @@ GEM
111108
rack (1.4.4)
112109
rack-cache (1.2)
113110
rack (>= 0.4)
114-
rack-ssl (1.3.2)
111+
rack-ssl (1.3.3)
115112
rack
116113
rack-test (0.6.2)
117114
rack (>= 1.0)
@@ -136,7 +133,7 @@ GEM
136133
rspec-core (2.12.2)
137134
rspec-expectations (2.12.1)
138135
diff-lcs (~> 1.1.3)
139-
rspec-mocks (2.12.1)
136+
rspec-mocks (2.12.2)
140137
rspec-rails (2.12.2)
141138
actionpack (>= 3.0)
142139
activesupport (>= 3.0)
@@ -150,18 +147,18 @@ GEM
150147
railties (~> 3.2.0)
151148
sass (>= 3.1.10)
152149
tilt (~> 1.3)
153-
selenium-webdriver (2.27.2)
150+
selenium-webdriver (2.29.0)
154151
childprocess (>= 0.2.5)
155-
libwebsocket (~> 0.1.3)
156152
multi_json (~> 1.0)
157153
rubyzip
154+
websocket (~> 1.0.4)
158155
sprockets (2.2.2)
159156
hike (~> 1.2)
160157
multi_json (~> 1.0)
161158
rack (~> 1.0)
162159
tilt (~> 1.1, != 1.3.0)
163160
sqlite3 (1.3.7)
164-
thor (0.16.0)
161+
thor (0.17.0)
165162
tilt (1.3.3)
166163
treetop (1.4.12)
167164
polyglot
@@ -172,7 +169,7 @@ GEM
172169
multi_json (~> 1.0, >= 1.0.2)
173170
warden (1.2.1)
174171
rack (>= 1.0)
175-
websocket (1.0.6)
172+
websocket (1.0.7)
176173
xpath (1.0.0)
177174
nokogiri (~> 1.3)
178175

@@ -182,13 +179,13 @@ PLATFORMS
182179
DEPENDENCIES
183180
better_errors (>= 0.3.2)
184181
binding_of_caller (>= 0.6.8)
185-
capybara (>= 2.0.1)
182+
capybara (>= 2.0.2)
186183
coffee-rails (~> 3.2.1)
187184
cucumber-rails (>= 1.3.0)
188185
database_cleaner (>= 0.9.1)
189-
devise (>= 2.2.2)
186+
devise (>= 2.2.3)
190187
email_spec (>= 1.4.0)
191-
factory_girl_rails (>= 4.1.0)
188+
factory_girl_rails (>= 4.2.0)
192189
figaro (>= 0.5.3)
193190
jquery-rails
194191
launchy (>= 2.1.2)

config/application.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Application < Rails::Application
2222
config.generators do |g|
2323

2424
g.test_framework :rspec, fixture: true
25-
g.fixture_replacement :factory_girl
25+
g.fixture_replacement :factory_girl, dir: 'spec/factories'
2626

2727

2828
g.view_specs false

config/locales/devise.en.yml

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,59 @@
11
# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
22

33
en:
4+
devise:
5+
confirmations:
6+
confirmed: "Your account was successfully confirmed. You are now signed in."
7+
send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
8+
send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
9+
failure:
10+
already_authenticated: "You are already signed in."
11+
inactive: "Your account was not activated yet."
12+
invalid: "Invalid email or password."
13+
invalid_token: "Invalid authentication token."
14+
locked: "Your account is locked."
15+
not_found_in_database: "Invalid email or password."
16+
timeout: "Your session expired, please sign in again to continue."
17+
unauthenticated: "You need to sign in or sign up before continuing."
18+
unconfirmed: "You have to confirm your account before continuing."
19+
mailer:
20+
confirmation_instructions:
21+
subject: "Confirmation instructions"
22+
reset_password_instructions:
23+
subject: "Reset password instructions"
24+
unlock_instructions:
25+
subject: "Unlock Instructions"
26+
omniauth_callbacks:
27+
failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
28+
success: "Successfully authenticated from %{kind} account."
29+
passwords:
30+
no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
31+
send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
32+
send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
33+
updated: "Your password was changed successfully. You are now signed in."
34+
updated_not_active: "Your password was changed successfully."
35+
registrations:
36+
destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
37+
signed_up: "Welcome! You have signed up successfully."
38+
signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
39+
signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
40+
signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
41+
update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
42+
updated: "You updated your account successfully."
43+
sessions:
44+
signed_in: "Signed in successfully."
45+
signed_out: "Signed out successfully."
46+
unlocks:
47+
send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
48+
send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
49+
unlocked: "Your account has been unlocked successfully. Please sign in to continue."
450
errors:
551
messages:
52+
already_confirmed: "was already confirmed, please try signing in"
53+
confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
654
expired: "has expired, please request a new one"
755
not_found: "not found"
8-
already_confirmed: "was already confirmed, please try signing in"
956
not_locked: "was not locked"
1057
not_saved:
1158
one: "1 error prohibited this %{resource} from being saved:"
1259
other: "%{count} errors prohibited this %{resource} from being saved:"
13-
confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
14-
15-
devise:
16-
failure:
17-
already_authenticated: 'You are already signed in.'
18-
unauthenticated: 'You need to sign in or sign up before continuing.'
19-
unconfirmed: 'You have to confirm your account before continuing.'
20-
locked: 'Your account is locked.'
21-
not_found_in_database: 'Invalid email or password.'
22-
invalid: 'Invalid email or password.'
23-
invalid_token: 'Invalid authentication token.'
24-
timeout: 'Your session expired, please sign in again to continue.'
25-
inactive: 'Your account was not activated yet.'
26-
sessions:
27-
signed_in: 'Signed in successfully.'
28-
signed_out: 'Signed out successfully.'
29-
passwords:
30-
send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
31-
updated: 'Your password was changed successfully. You are now signed in.'
32-
updated_not_active: 'Your password was changed successfully.'
33-
send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
34-
no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
35-
confirmations:
36-
send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
37-
send_paranoid_instructions: 'If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
38-
confirmed: 'Your account was successfully confirmed. You are now signed in.'
39-
registrations:
40-
signed_up: 'Welcome! You have signed up successfully.'
41-
signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
42-
signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
43-
signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
44-
updated: 'You updated your account successfully.'
45-
update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
46-
destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
47-
unlocks:
48-
send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
49-
unlocked: 'Your account has been unlocked successfully. Please sign in to continue.'
50-
send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
51-
omniauth_callbacks:
52-
success: 'Successfully authenticated from %{kind} account.'
53-
failure: 'Could not authenticate you from %{kind} because "%{reason}".'
54-
mailer:
55-
confirmation_instructions:
56-
subject: 'Confirmation instructions'
57-
reset_password_instructions:
58-
subject: 'Reset password instructions'
59-
unlock_instructions:
60-
subject: 'Unlock Instructions'

0 commit comments

Comments
 (0)