diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-22 11:13:27 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-22 11:13:27 -0500 |
| commit | a42b2c388df5154eecefd8eb7d8a68373e794d6e (patch) | |
| tree | 7cfcbca6f78d66fb05d56586f322067dcb4d9c92 /app/controllers/profiles_controller.rb | |
| parent | 647f28bd1d92eabe239a7f0f4a65eb100c0cda73 (diff) | |
| parent | 18c049886e0f9ad2d094f02483aea272d0e029fb (diff) | |
| download | gitlab-ce-a42b2c388df5154eecefd8eb7d8a68373e794d6e.tar.gz | |
Merge branch 'master' into issue_7959
Diffstat (limited to 'app/controllers/profiles_controller.rb')
| -rw-r--r-- | app/controllers/profiles_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index 30e2886caca..c5fa756d02b 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -35,8 +35,7 @@ class ProfilesController < Profiles::ApplicationController def audit_log @events = AuditEvent.where(entity_type: "User", entity_id: current_user.id). order("created_at DESC"). - page(params[:page]). - per(PER_PAGE) + page(params[:page]) end def update_username |