diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-04-21 18:56:10 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-04-22 14:25:28 +0300 |
| commit | db03dc318e41f93887f668969dd207268a3168dc (patch) | |
| tree | 0cf07b0e339231214dac687af2ab91b7ae7493c9 /app/controllers | |
| parent | 759875387cab016897ec17c924ca3cea94c22387 (diff) | |
| download | gitlab-ci-db03dc318e41f93887f668969dd207268a3168dc.tar.gz | |
refactoring network related coderefactoring_user_url
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/user_sessions_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index dfeb091..8d6e5b5 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -76,7 +76,7 @@ class ProjectsController < ApplicationController def destroy project.destroy - Network.new.disable_ci(current_user.url, project.gitlab_id, current_user.private_token) + Network.new.disable_ci(project.gitlab_id, current_user.private_token) EventService.new.remove_project(current_user, project) diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb index 891bbb8..5700615 100644 --- a/app/controllers/user_sessions_controller.rb +++ b/app/controllers/user_sessions_controller.rb @@ -18,7 +18,7 @@ class UserSessionsController < ApplicationController token = client.auth_code.get_token(params[:code], redirect_uri: callback_user_sessions_url).token @user_session = UserSession.new - user = @user_session.authenticate(access_token: token, url: GitlabCi.config.gitlab_server.url) + user = @user_session.authenticate(access_token: token) if user && sign_in(user) redirect_to root_path |