diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-07-03 16:33:53 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-07-03 16:33:53 +0200 |
| commit | 4eebf9600e43cf6b0abffe0ffcde20cffc9b2800 (patch) | |
| tree | 9e28e2f942c94048a66c776ae5ced28ac22bc341 /lib/api | |
| parent | 4cb9b752c2c342ba0e1ec650cad0aef9ca9fbc33 (diff) | |
| parent | 8c6b1b6ec20deebd247aee9bb61e7113bf029dca (diff) | |
| download | gitlab-ci-4eebf9600e43cf6b0abffe0ffcde20cffc9b2800.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ci
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/forks.rb | 2 | ||||
| -rw-r--r-- | lib/api/helpers.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/forks.rb b/lib/api/forks.rb index c1807f0..cb53d68 100644 --- a/lib/api/forks.rb +++ b/lib/api/forks.rb @@ -18,7 +18,7 @@ module API authenticate_project_token!(project) user_session = UserSession.new - user = user_session.authenticate_by_token(private_token: params[:private_token]) + user = user_session.authenticate(private_token: params[:private_token]) fork = CreateProjectService.new.execute( user, diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index d768624..cff5920 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -9,7 +9,7 @@ module API options = { private_token: (params[PRIVATE_TOKEN_PARAM] || env[PRIVATE_TOKEN_HEADER]) } - UserSession.new.authenticate_by_token(options) + UserSession.new.authenticate(options) end end |