Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

8067b877

Commit 8067b877 authored 9 years ago by Mateus Rambo Strey

Downloads
- Plain Diff

Merge branch 'fix-interface#3' into 'master'

Fix interface#3



See merge request !181

parents 75760824 723b7e76

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/stylesheets/application.scss 27 additions, 10 deletions

app/assets/stylesheets/application.scss
app/assets/stylesheets/application/learning_objects.scss 15 additions, 4 deletions

app/assets/stylesheets/application/learning_objects.scss
app/controllers/application_controller.rb 1 addition, 1 deletion

app/controllers/application_controller.rb
app/controllers/management/users_controller.rb 1 addition, 1 deletion

app/controllers/management/users_controller.rb
app/controllers/welcome_controller.rb 3 additions, 0 deletions

app/controllers/welcome_controller.rb
app/models/user.rb 1 addition, 0 deletions

app/models/user.rb
app/views/devise/registrations/new.html.erb 2 additions, 2 deletions

app/views/devise/registrations/new.html.erb
app/views/learning_objects/show.html.erb 2 additions, 3 deletions

app/views/learning_objects/show.html.erb
app/views/shared/application/_header.html.erb 5 additions, 3 deletions

app/views/shared/application/_header.html.erb
app/views/shared/application/_home.html.erb 1 addition, 1 deletion

app/views/shared/application/_home.html.erb
app/views/welcome/terms_of_service.html.erb 160 additions, 0 deletions

app/views/welcome/terms_of_service.html.erb
config/locales/pt-BR.yml 1 addition, 0 deletions

config/locales/pt-BR.yml
config/routes.rb 2 additions, 0 deletions

config/routes.rb

with 221 additions and 25 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