Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

Admin
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

61d0fdb3

Unverified Commit 61d0fdb3 authored 3 years ago by Sébastien Gaya

Downloads
- Plain Diff

Merge branch 'master' of github.com:noesya/osuny

parents 36e48169 9a740a33

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/server/application_controller.rb 3 additions, 3 deletions

app/controllers/server/application_controller.rb
app/models/ability.rb 1 addition, 1 deletion

app/models/ability.rb
app/models/user/with_authentication.rb 1 addition, 1 deletion

app/models/user/with_authentication.rb
app/views/application/_footer.html.erb 6 additions, 6 deletions

app/views/application/_footer.html.erb
app/views/devise/two_factor_authentication/show.html.erb 35 additions, 32 deletions

app/views/devise/two_factor_authentication/show.html.erb
app/views/layouts/devise.html.erb 8 additions, 1 deletion

app/views/layouts/devise.html.erb
config/locales/en.yml 2 additions, 0 deletions

config/locales/en.yml
config/locales/fr.yml 2 additions, 0 deletions

config/locales/fr.yml

with 58 additions and 44 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment