summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-06 10:09:53 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-06 10:09:53 +0000
commitf3590c83ea52971f2c30534952ea4d1fd6fc1b81 (patch)
tree00609053c12c960dd645ecad45dcaae2f58d5f9d /config
parent5f52d6a038dc64db42d137aa83b3c104766c7098 (diff)
parent411829fdb5f24f97ce17e05f5fd018d47075b216 (diff)
downloadgitlab-ce-f3590c83ea52971f2c30534952ea4d1fd6fc1b81.tar.gz
Merge branch 'audit_log' into 'master'
Audit log for user authentication https://dev.gitlab.org/gitlab/gitlabhq/issues/2318 See merge request !931
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index f904c975733..8617839a256 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -208,7 +208,7 @@ Gitlab::Application.routes.draw do
#
resource :profile, only: [:show, :update] do
member do
- get :history
+ get :audit_log
get :applications
put :reset_private_token