Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
6b4602a7
Commit
6b4602a7
authored
May 28, 2013
by
Peter LeFanu Lumsdaine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Grammar fix in error message for blocked login (in "application_controller.rb")
parent
45f9cca9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+2
-2
No files found.
app/controllers/application_controller.rb
View file @
6b4602a7
...
...
@@ -32,7 +32,7 @@ class ApplicationController < ActionController::Base
def
reject_blocked!
if
current_user
&&
current_user
.
blocked?
sign_out
current_user
flash
[
:alert
]
=
"Your account is blocked. Retry when an admin
unblock
it."
flash
[
:alert
]
=
"Your account is blocked. Retry when an admin
has unblocked
it."
redirect_to
new_user_session_path
end
end
...
...
@@ -40,7 +40,7 @@ class ApplicationController < ActionController::Base
def
after_sign_in_path_for
resource
if
resource
.
is_a?
(
User
)
&&
resource
.
respond_to?
(
:blocked?
)
&&
resource
.
blocked?
sign_out
resource
flash
[
:alert
]
=
"Your account is blocked. Retry when an admin
unblock
it."
flash
[
:alert
]
=
"Your account is blocked. Retry when an admin
has unblocked
it."
new_user_session_path
else
super
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment