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

4da07c1a

Unverified Commit 4da07c1a authored 2 years ago by Sébastien Gaya

Downloads
- Plain Diff

Merge branch 'master' into 357-cloisonnement-extranets

parents 62574961 7ad840b2

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile 2 additions, 1 deletion

Gemfile
Gemfile.lock 13 additions, 8 deletions

Gemfile.lock
app/controllers/users/omniauth_callbacks_controller.rb 2 additions, 2 deletions

app/controllers/users/omniauth_callbacks_controller.rb
app/models/university/with_sso.rb 4 additions, 1 deletion

app/models/university/with_sso.rb
app/models/user/with_omniauth.rb 10 additions, 6 deletions

app/models/user/with_omniauth.rb
app/views/devise/sessions/new.html.erb 1 addition, 1 deletion

app/views/devise/sessions/new.html.erb
app/views/server/universities/_form.html.erb 3 additions, 0 deletions

app/views/server/universities/_form.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
config/locales/university/en.yml 6 additions, 0 deletions

config/locales/university/en.yml
config/locales/university/fr.yml 6 additions, 0 deletions

config/locales/university/fr.yml

with 51 additions and 19 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