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

0500f961

There was an error fetching the commit references. Please try again later.

Unverified Commit 0500f961 authored 2 years ago by Sébastien Gaya

Downloads
- Plain Diff

Merge branch 'main' into extranet/blocks

parents 438e5856 599b48f8

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/helpers/admin/application_helper.rb 5 additions, 0 deletions

app/helpers/admin/application_helper.rb
app/models/communication/extranet/with_features.rb 2 additions, 2 deletions

app/models/communication/extranet/with_features.rb
app/models/user/with_registration_context.rb 13 additions, 1 deletion

app/models/user/with_registration_context.rb
app/views/admin/communication/extranets/_sidebar.html.erb 1 addition, 1 deletion

app/views/admin/communication/extranets/_sidebar.html.erb
app/views/admin/communication/extranets/show.html.erb 2 additions, 2 deletions

app/views/admin/communication/extranets/show.html.erb
app/views/admin/dashboard/index.html.erb 27 additions, 0 deletions

app/views/admin/dashboard/index.html.erb
config/locales/communication/en.yml 2 additions, 0 deletions

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

config/locales/communication/fr.yml
db/schema.rb 39 additions, 53 deletions

db/schema.rb

with 93 additions and 59 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