diff options
| author | ThibG <thib@sitedethib.com> | 2018-05-23 19:19:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 19:19:28 +0200 |
| commit | 88ec5193cb377500c4500d31d7ba9fa441f1f5ee (patch) | |
| tree | d517f10fdeffb6adaf7e349ea78593c02534c84a /app/controllers | |
| parent | 7719fe0df27a59cb7292989688efaa4efc6cbccc (diff) | |
| parent | e0ef89c73f6b380a2841b9dcde07725d515340a4 (diff) | |
Merge pull request #510 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/invites_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/settings/applications_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index 2e9f73bb8..70818610c 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -9,7 +9,7 @@ class InvitesController < ApplicationController before_action :set_pack def index - authorize :invite, :index? + authorize :invite, :create? @invites = invites @invite = Invite.new(expires_in: 1.day.to_i) diff --git a/app/controllers/settings/applications_controller.rb b/app/controllers/settings/applications_controller.rb index 35a6f7f9e..03c890a50 100644 --- a/app/controllers/settings/applications_controller.rb +++ b/app/controllers/settings/applications_controller.rb @@ -6,7 +6,7 @@ class Settings::ApplicationsController < Settings::BaseController before_action :prepare_scopes, only: [:create, :update] def index - @applications = current_user.applications.page(params[:page]) + @applications = current_user.applications.order(id: :desc).page(params[:page]) end def new |