diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-04 23:18:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-04 23:18:14 +0100 |
| commit | 76b4e7727b7497c1b68e06133831701f8950ae19 (patch) | |
| tree | dee110c9c6afd598b202e73283d5c8f8ae6d3999 /app/controllers | |
| parent | ec26f7c1b16ca1429991212292e35e520c617485 (diff) | |
| parent | fa433ac5a638b00f5bf77ee52955696d7aa842d6 (diff) | |
Merge pull request #2101 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/v1/notifications_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/settings/applications_controller.rb | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb index a6ed359c9..93785b14a 100644 --- a/app/controllers/api/v1/notifications_controller.rb +++ b/app/controllers/api/v1/notifications_controller.rb @@ -6,7 +6,7 @@ class Api::V1::NotificationsController < Api::BaseController before_action :require_user! after_action :insert_pagination_headers, only: :index - DEFAULT_NOTIFICATIONS_LIMIT = 15 + DEFAULT_NOTIFICATIONS_LIMIT = 40 def index @notifications = load_notifications diff --git a/app/controllers/settings/applications_controller.rb b/app/controllers/settings/applications_controller.rb index d3ac268d8..e6e137c2b 100644 --- a/app/controllers/settings/applications_controller.rb +++ b/app/controllers/settings/applications_controller.rb @@ -29,7 +29,13 @@ class Settings::ApplicationsController < Settings::BaseController def update if @application.update(application_params) - redirect_to settings_applications_path, notice: I18n.t('generic.changes_saved_msg') + if @application.scopes_previously_changed? + @access_token = current_user.token_for_app(@application) + @access_token.destroy + redirect_to settings_application_path(@application), notice: I18n.t('applications.token_regenerated') + else + redirect_to settings_application_path(@application), notice: I18n.t('generic.changes_saved_msg') + end else render :show end |