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

03e21ed7

Commit 03e21ed7 authored 9 years ago by Mateus Rambo Strey

Downloads
- Plain Diff

Merge branch 'fix-bookmarks' into 'master'

Fix bookmarks



See merge request !197

parents 98264a9a cf887861

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/application/collections.coffee 38 additions, 17 deletions

app/assets/javascripts/application/collections.coffee
app/controllers/bookmarks_controller.rb 6 additions, 1 deletion

app/controllers/bookmarks_controller.rb
app/controllers/collections_controller.rb 2 additions, 1 deletion

app/controllers/collections_controller.rb
app/controllers/users_controller.rb 2 additions, 2 deletions

app/controllers/users_controller.rb
app/views/bookmarks/_list.html.erb 3 additions, 0 deletions

app/views/bookmarks/_list.html.erb
app/views/bookmarks/show.html.erb 8 additions, 12 deletions

app/views/bookmarks/show.html.erb
app/views/collections/show.html.erb 6 additions, 7 deletions

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

app/views/devise/registrations/new.html.erb
app/views/learning_objects/_learning_object_vertical.erb 1 addition, 1 deletion

app/views/learning_objects/_learning_object_vertical.erb
app/views/shared/application/_search.erb 1 addition, 1 deletion

app/views/shared/application/_search.erb
config/routes.rb 1 addition, 0 deletions

config/routes.rb

with 71 additions and 45 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