Merge branch 'develop' into 'master'
Curatorship and Gamification done See merge request rfhf19/cleanning-portalmec!17
No related branches found
No related tags found
Showing
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 254 additions, 220 deletionsGemfile.lock
- app/controllers/concerns/paginator.rb 10 additions, 1 deletionapp/controllers/concerns/paginator.rb
- app/controllers/v1/complaint_votes_controller.rb 112 additions, 0 deletionsapp/controllers/v1/complaint_votes_controller.rb
- app/controllers/v1/complaints_controller.rb 3 additions, 1 deletionapp/controllers/v1/complaints_controller.rb
- app/controllers/v1/contacts_controller.rb 6 additions, 6 deletionsapp/controllers/v1/contacts_controller.rb
- app/controllers/v1/learning_objects_complaints_controller.rb 107 additions, 0 deletionsapp/controllers/v1/learning_objects_complaints_controller.rb
- app/controllers/v1/sessions_controller.rb 55 additions, 28 deletionsapp/controllers/v1/sessions_controller.rb
- app/controllers/v1/submissions_controller.rb 23 additions, 7 deletionsapp/controllers/v1/submissions_controller.rb
- app/controllers/v1/unlocked_achievements_controller.rb 9 additions, 0 deletionsapp/controllers/v1/unlocked_achievements_controller.rb
- app/controllers/v1/users_controller.rb 13 additions, 3 deletionsapp/controllers/v1/users_controller.rb
- app/mailers/application_mailer.rb 2 additions, 2 deletionsapp/mailers/application_mailer.rb
- app/mailers/contacts_mailer.rb 2 additions, 2 deletionsapp/mailers/contacts_mailer.rb
- app/mailers/user_mailer.rb 18 additions, 0 deletionsapp/mailers/user_mailer.rb
- app/models/achievement.rb 1 addition, 1 deletionapp/models/achievement.rb
- app/models/action.rb 3 additions, 1 deletionapp/models/action.rb
- app/models/action_counter.rb 3 additions, 1 deletionapp/models/action_counter.rb
- app/models/collection.rb 2 additions, 1 deletionapp/models/collection.rb
- app/models/collection_item.rb 1 addition, 1 deletionapp/models/collection_item.rb
- app/models/complaint.rb 3 additions, 3 deletionsapp/models/complaint.rb
Loading
Please register or sign in to comment