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

14209eb7

Unverified Commit 14209eb7 authored 3 years ago by Sébastien Gaya

Downloads
- Plain Diff

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

parents 938fb79d 0b5a18ca

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile.lock 1 addition, 1 deletion

Gemfile.lock
app/assets/javascripts/admin.js 2 additions, 0 deletions

app/assets/javascripts/admin.js
app/assets/stylesheets/admin.sass 1 addition, 0 deletions

app/assets/stylesheets/admin.sass
app/controllers/admin/users_controller.rb 1 addition, 1 deletion

app/controllers/admin/users_controller.rb
app/controllers/users/registrations_controller.rb 2 additions, 2 deletions

app/controllers/users/registrations_controller.rb
app/views/devise/registrations/edit.html.erb 1 addition, 0 deletions

app/views/devise/registrations/edit.html.erb
package.json 2 additions, 0 deletions

package.json
yarn.lock 10 additions, 0 deletions

yarn.lock

with 20 additions and 4 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