Merge branch 'release/0.7.11.0'
Showing
- .rubocop.yml 12 additions, 6 deletions.rubocop.yml
- Changelog.md 14 additions, 0 deletionsChangelog.md
- Gemfile 36 additions, 34 deletionsGemfile
- Gemfile.lock 178 additions, 160 deletionsGemfile.lock
- app/assets/images/branding/apple-splash.png 0 additions, 0 deletionsapp/assets/images/branding/apple-splash.png
- app/assets/images/branding/logos/app-icon-512.png 0 additions, 0 deletionsapp/assets/images/branding/logos/app-icon-512.png
- app/assets/images/branding/logos/app-icon.png 0 additions, 0 deletionsapp/assets/images/branding/logos/app-icon.png
- app/assets/stylesheets/base.scss 2 additions, 1 deletionapp/assets/stylesheets/base.scss
- app/assets/stylesheets/forms.scss 5 additions, 0 deletionsapp/assets/stylesheets/forms.scss
- app/assets/stylesheets/login.scss 1 addition, 0 deletionsapp/assets/stylesheets/login.scss
- app/controllers/application_controller.rb 7 additions, 0 deletionsapp/controllers/application_controller.rb
- app/controllers/manifest_controller.rb 27 additions, 0 deletionsapp/controllers/manifest_controller.rb
- app/controllers/sessions_controller.rb 47 additions, 3 deletionsapp/controllers/sessions_controller.rb
- app/controllers/two_factor_authentications_controller.rb 55 additions, 0 deletionsapp/controllers/two_factor_authentications_controller.rb
- app/controllers/users_controller.rb 2 additions, 0 deletionsapp/controllers/users_controller.rb
- app/helpers/application_helper.rb 5 additions, 0 deletionsapp/helpers/application_helper.rb
- app/models/user.rb 9 additions, 1 deletionapp/models/user.rb
- app/services/diaspora_link_service.rb 16 additions, 4 deletionsapp/services/diaspora_link_service.rb
- app/views/devise/confirmations/new.html.haml 2 additions, 2 deletionsapp/views/devise/confirmations/new.html.haml
- app/views/devise/passwords/edit.mobile.haml 1 addition, 1 deletionapp/views/devise/passwords/edit.mobile.haml
Loading
Please register or sign in to comment