diff options
author | Valery Sizov <valery@gitlab.com> | 2015-01-23 16:55:09 -0800 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2015-01-23 16:55:09 -0800 |
commit | 4fdefdf71e73e6554706c357f8a091bf69694c10 (patch) | |
tree | bd5e238c409ad4f22eb2d7a996d43bdaaf1bbb47 | |
parent | cb80ad67dace23a67620a2b0285b7c0e64775894 (diff) | |
parent | 2bd06c758bddee0dfce64e3f9271bca5870240d4 (diff) | |
download | gitlab-ci-4fdefdf71e73e6554706c357f8a091bf69694c10.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ci
-rw-r--r-- | CHANGELOG | 3 | ||||
-rw-r--r-- | app/controllers/user_sessions_controller.rb | 4 | ||||
-rw-r--r-- | app/models/project_services/slack_service.rb | 2 | ||||
-rw-r--r-- | lib/api/runners.rb | 4 | ||||
-rw-r--r-- | spec/requests/api/runners_spec.rb | 7 |
5 files changed, 14 insertions, 6 deletions
@@ -1,5 +1,6 @@ v5.5.0 - - + - Fix OAuth login with GitLab installed in relative URL + - v5.4.1 - Fix 500 if on builds page if build has no job diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb index 044849b..891bbb8 100644 --- a/app/controllers/user_sessions_controller.rb +++ b/app/controllers/user_sessions_controller.rb @@ -43,8 +43,8 @@ class UserSessionsController < ApplicationController GitlabCi.config.gitlab_server.app_secret, { site: GitlabCi.config.gitlab_server.url, - authorize_url: '/oauth/authorize', - token_url: '/oauth/token' + authorize_url: 'oauth/authorize', + token_url: 'oauth/token' } ) end diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb index e187a9f..44f0cd4 100644 --- a/app/models/project_services/slack_service.rb +++ b/app/models/project_services/slack_service.rb @@ -50,7 +50,7 @@ class SlackService < Service def can_test? # slack notification is useful only for builds either successful or failed - project.commits.order(id: desc).any? do |commit| + project.commits.order(id: :desc).any? do |commit| case commit.status.to_sym when :failed true diff --git a/lib/api/runners.rb b/lib/api/runners.rb index f8239a1..79d0b56 100644 --- a/lib/api/runners.rb +++ b/lib/api/runners.rb @@ -33,10 +33,10 @@ module API runner = if params[:token] == GitlabCi::REGISTRATION_TOKEN # Create shared runner. Requires admin access - Runner.create + Runner.create(description: params[:hostname]) elsif project = Project.find_by(token: params[:token]) # Create a specific runner for project. - project.runners.create + project.runners.create(description: params[:hostname]) end return forbidden! unless runner diff --git a/spec/requests/api/runners_spec.rb b/spec/requests/api/runners_spec.rb index 7e35e5b..eb5e0ae 100644 --- a/spec/requests/api/runners_spec.rb +++ b/spec/requests/api/runners_spec.rb @@ -45,6 +45,13 @@ describe API::API do it { response.status.should == 201 } end + describe "should create a runner with description" do + before { post api("/runners/register"), token: GitlabCi::REGISTRATION_TOKEN, hostname: "server.hostname" } + + it { response.status.should == 201 } + it { Runner.first.description.should == "server.hostname" } + end + describe "should create a runner if project token provided" do let(:project) { FactoryGirl.create(:project) } before { post api("/runners/register"), token: project.token } |