Merge branch 'refactoring_user_url' into 'master'

Refactoring network related code

https://dev.gitlab.org/gitlab/gitlab-ci/issues/139

See merge request !74

2 files changed, 2 insertions, 2 deletions

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f10d42b..dfef9bf 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -75,7 +75,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