Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
liberty
host
Smilodon
Commits
356d3874
Commit
356d3874
authored
Nov 30, 2016
by
Eugen Rochko
Browse files
Normalize localizations, add stub for admin/accounts
parent
4a2347da
Changes
9
Hide whitespace changes
Inline
Side-by-side
app/controllers/admin/accounts_controller.rb
0 → 100644
View file @
356d3874
# frozen_string_literal: true
class
Admin::AccountsController
<
ApplicationController
before_action
:require_admin!
layout
'public'
def
index
end
def
show
end
end
app/controllers/application_controller.rb
View file @
356d3874
...
...
@@ -37,7 +37,7 @@ class ApplicationController < ActionController::Base
end
def
set_user_activity
current_user
.
touch
(
:current_sign_in_at
)
if
!
current_user
.
nil?
&&
current_user
.
current_sign_in_at
<
24
.
hours
.
ago
current_user
.
touch
(
:current_sign_in_at
)
if
!
current_user
.
nil?
&&
(
current_user
.
current_sign_in_at
.
nil?
||
current_user
.
current_sign_in_at
<
24
.
hours
.
ago
)
end
protected
...
...
app/helpers/admin/accounts_helper.rb
0 → 100644
View file @
356d3874
module
Admin::AccountsHelper
end
app/views/admin/accounts/index.html.haml
0 → 100644
View file @
356d3874
app/views/admin/accounts/show.html.haml
0 → 100644
View file @
356d3874
config/locales/simple_form.fr.yml
View file @
356d3874
...
...
@@ -16,14 +16,14 @@ fr:
password
:
Mot de passe
silenced
:
Ne pas apparaître dans le fil public
username
:
Identifiant
interactions
:
must_be_follower
:
Masquer les notifications des personnes qui ne vous suivent pas
must_be_following
:
Masquer les notifications des personnes que vous ne suivez pas
notification_emails
:
favourite
:
Envoyer un courriel lorsque quelqu’un ajoute mes statut à ses favoris
follow
:
Envoyer un courriel lorsque quelqu’un me suit
mention
:
Envoyer un courriel lorsque quelqu’un me mentionne
reblog
:
Envoyer un courriel lorsque quelqu’un partage mes statuts
interactions
:
must_be_follower
:
Masquer les notifications des personnes qui ne vous suivent pas
must_be_following
:
Masquer les notifications des personnes que vous ne suivez pas
'
no'
:
Non
required
:
mark
:
"
*"
...
...
config/routes.rb
View file @
356d3874
...
...
@@ -46,6 +46,7 @@ Rails.application.routes.draw do
namespace
:admin
do
resources
:pubsubhubbub
,
only:
[
:index
]
resources
:accounts
,
only:
[
:index
,
:show
]
end
namespace
:api
do
...
...
spec/controllers/admin/accounts_controller_spec.rb
0 → 100644
View file @
356d3874
require
'rails_helper'
RSpec
.
describe
Admin
::
AccountsController
,
type: :controller
do
before
do
sign_in
Fabricate
(
:user
,
admin:
true
),
scope: :user
end
describe
'GET #index'
do
it
'returns http success'
do
get
:index
expect
(
response
).
to
have_http_status
(
:success
)
end
end
describe
'GET #show'
do
it
'returns http success'
do
get
:show
,
params:
{
id:
1
}
expect
(
response
).
to
have_http_status
(
:success
)
end
end
end
spec/helpers/admin/accounts_helper_spec.rb
0 → 100644
View file @
356d3874
require
'rails_helper'
# Specs in this file have access to a helper object that includes
# the Admin::AccountsHelper. For example:
#
# describe Admin::AccountsHelper do
# describe "string concat" do
# it "concats two strings with spaces" do
# expect(helper.concat_strings("this","that")).to eq("this that")
# end
# end
# end
RSpec
.
describe
Admin
::
AccountsHelper
,
type: :helper
do
pending
"add some examples to (or delete)
#{
__FILE__
}
"
end
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