Merge branch 'master' into glitch-soc/merge-upstream

2018-05-23 16:05:19 +02:00
parent 2289250f69 d8864b9e9d
commit e0ef89c73f
21 changed files with 295 additions and 70 deletions
--- 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)
--- 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