-
- Downloads
Merge branch '40-websockets-chat' into 'Development'
Resolve "WebSockets chat" See merge request group-10/habit-tracker-web-app!57
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 85 additions, 85 deletions.gitlab-ci.yml
- app/assets/javascripts/application.js 2 additions, 0 deletionsapp/assets/javascripts/application.js
- app/assets/javascripts/room_channel.js 1 addition, 2 deletionsapp/assets/javascripts/room_channel.js
- app/assets/javascripts/rooms.js 1 addition, 1 deletionapp/assets/javascripts/rooms.js
- app/assets/stylesheets/application.scss 4 additions, 0 deletionsapp/assets/stylesheets/application.scss
- app/assets/stylesheets/buttons.scss 13 additions, 0 deletionsapp/assets/stylesheets/buttons.scss
- app/assets/stylesheets/scaffolds.scss 0 additions, 17 deletionsapp/assets/stylesheets/scaffolds.scss
- app/controllers/api/v1/habits_controller.rb 3 additions, 2 deletionsapp/controllers/api/v1/habits_controller.rb
- app/controllers/leaderboards_controller.rb 8 additions, 0 deletionsapp/controllers/leaderboards_controller.rb
- app/controllers/room_messages_controller.rb 2 additions, 1 deletionapp/controllers/room_messages_controller.rb
- app/controllers/rooms_controller.rb 7 additions, 3 deletionsapp/controllers/rooms_controller.rb
- app/models/leaderboard.rb 2 additions, 0 deletionsapp/models/leaderboard.rb
- app/models/room.rb 2 additions, 0 deletionsapp/models/room.rb
- app/views/leaderboards/show.html.erb 2 additions, 1 deletionapp/views/leaderboards/show.html.erb
- app/views/rooms/_rooms.html.erb 2 additions, 2 deletionsapp/views/rooms/_rooms.html.erb
- app/views/rooms/show.html.erb 70 additions, 52 deletionsapp/views/rooms/show.html.erb
- app/views/shared/_header.html.erb 2 additions, 1 deletionapp/views/shared/_header.html.erb
- config/initializers/assets.rb 1 addition, 1 deletionconfig/initializers/assets.rb
- config/locales/en.yml 13 additions, 0 deletionsconfig/locales/en.yml
- db/migrate/20210424183928_add_rooms_to_leaderboards.rb 5 additions, 0 deletionsdb/migrate/20210424183928_add_rooms_to_leaderboards.rb
Loading
Please register or sign in to comment