-
- Téléchargements
Merge branch 'master' into follow
Conflicts: features/step_definitions/user_steps.rb
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- Gemfile 4 ajouts, 4 suppressionsGemfile
- Gemfile.lock 14 ajouts, 14 suppressionsGemfile.lock
- README.md 3 ajouts, 3 suppressionsREADME.md
- app/controllers/application_controller.rb 4 ajouts, 0 suppressionapp/controllers/application_controller.rb
- app/views/js/_websocket_js.haml 10 ajouts, 6 suppressionsapp/views/js/_websocket_js.haml
- config/app_config.yml.example 4 ajouts, 0 suppressionconfig/app_config.yml.example
- config/initializers/resque.rb 17 ajouts, 2 suppressionsconfig/initializers/resque.rb
- config/server.sh 0 ajout, 1 suppressionconfig/server.sh
- db/schema.rb 1 ajout, 1 suppressiondb/schema.rb
- features/change_password.feature 13 ajouts, 0 suppressionfeatures/change_password.feature
- features/step_definitions/user_steps.rb 8 ajouts, 0 suppressionfeatures/step_definitions/user_steps.rb
- features/support/env.rb 1 ajout, 0 suppressionfeatures/support/env.rb
- lib/app_config.rb 5 ajouts, 1 suppressionlib/app_config.rb
- lib/diaspora/web_socket.rb 10 ajouts, 2 suppressionslib/diaspora/web_socket.rb
- public/javascripts/web-socket-receiver.js 10 ajouts, 8 suppressionspublic/javascripts/web-socket-receiver.js
- script/get_config.rb 42 ajouts, 0 suppressionscript/get_config.rb
- script/server 9 ajouts, 7 suppressionsscript/server
- script/websocket_server.rb 1 ajout, 1 suppressionscript/websocket_server.rb
- spec/controllers/registrations_controller_spec.rb 4 ajouts, 3 suppressionsspec/controllers/registrations_controller_spec.rb
- spec/controllers/sessions_controller_spec.rb 7 ajouts, 5 suppressionsspec/controllers/sessions_controller_spec.rb
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter