From fbd16e54205f9a80a58b33f0e6bdf23b3007470c Mon Sep 17 00:00:00 2001 From: Spencer Owen Date: Mon, 16 Sep 2013 23:52:26 -0600 Subject: Corrects the update document to match the version of gitshell specified in the install document (1.7.1) --- doc/update/6.0-to-6.1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/update/6.0-to-6.1.md b/doc/update/6.0-to-6.1.md index dcd09be72f7..5076d0497e6 100644 --- a/doc/update/6.0-to-6.1.md +++ b/doc/update/6.0-to-6.1.md @@ -36,7 +36,7 @@ sudo -u git -H git checkout 6-1-stable ```bash cd /home/git/gitlab-shell sudo -u git -H git fetch -sudo -u git -H git checkout v1.7.0 +sudo -u git -H git checkout v1.7.1 ``` ### 4. Install libs, migrations, etc. -- cgit v1.2.1 From b099951c554e74165ec18bc4011b20811b6c376c Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Sun, 22 Sep 2013 06:46:36 +0900 Subject: Fix API::MergeRequest Refs #5145 --- lib/api/merge_requests.rb | 2 +- spec/requests/api/merge_requests_spec.rb | 52 ++++++++++++++++---------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 4a521c3daeb..d690f1d07e7 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -4,7 +4,7 @@ module API before { authenticate! } before { Thread.current[:current_user] = current_user } - resource :projects, requirements: { id: /[a-zA-Z.0-9_\-]+\/[a-zA-Z.0-9_\-]+/ } do + resource :projects do helpers do def handle_merge_request_errors!(errors) if errors[:project_access].any? diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index fb4a7d9bc19..2f11f562aa1 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -14,14 +14,14 @@ describe API::API do describe "GET /projects/:id/merge_requests" do context "when unauthenticated" do it "should return authentication error" do - get api("/projects/#{project.to_param}/merge_requests") + get api("/projects/#{project.id}/merge_requests") response.status.should == 401 end end context "when authenticated" do it "should return an array of merge_requests" do - get api("/projects/#{project.to_param}/merge_requests", user) + get api("/projects/#{project.id}/merge_requests", user) response.status.should == 200 json_response.should be_an Array json_response.first['title'].should == merge_request.title @@ -31,13 +31,13 @@ describe API::API do describe "GET /projects/:id/merge_request/:merge_request_id" do it "should return merge_request" do - get api("/projects/#{project.to_param}/merge_request/#{merge_request.id}", user) + get api("/projects/#{project.id}/merge_request/#{merge_request.id}", user) response.status.should == 200 json_response['title'].should == merge_request.title end it "should return a 404 error if merge_request_id not found" do - get api("/projects/#{project.to_param}/merge_request/999", user) + get api("/projects/#{project.id}/merge_request/999", user) response.status.should == 404 end end @@ -45,32 +45,32 @@ describe API::API do describe "POST /projects/:id/merge_requests" do context 'between branches projects' do it "should return merge_request" do - post api("/projects/#{project.to_param}/merge_requests", user), + post api("/projects/#{project.id}/merge_requests", user), title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user response.status.should == 201 json_response['title'].should == 'Test merge_request' end it "should return 422 when source_branch equals target_branch" do - post api("/projects/#{project.to_param}/merge_requests", user), + post api("/projects/#{project.id}/merge_requests", user), title: "Test merge_request", source_branch: "master", target_branch: "master", author: user response.status.should == 422 end it "should return 400 when source_branch is missing" do - post api("/projects/#{project.to_param}/merge_requests", user), + post api("/projects/#{project.id}/merge_requests", user), title: "Test merge_request", target_branch: "master", author: user response.status.should == 400 end it "should return 400 when target_branch is missing" do - post api("/projects/#{project.to_param}/merge_requests", user), + post api("/projects/#{project.id}/merge_requests", user), title: "Test merge_request", source_branch: "stable", author: user response.status.should == 400 end it "should return 400 when title is missing" do - post api("/projects/#{project.to_param}/merge_requests", user), + post api("/projects/#{project.id}/merge_requests", user), target_branch: 'master', source_branch: 'stable' response.status.should == 400 end @@ -90,54 +90,54 @@ describe API::API do end it "should return merge_request" do - post api("/projects/#{fork_project.to_param}/merge_requests", user2), + post api("/projects/#{fork_project.id}/merge_requests", user2), title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user2, target_project_id: project.id response.status.should == 201 json_response['title'].should == 'Test merge_request' end it "should not return 422 when source_branch equals target_branch" do - project.to_param.should_not == fork_project.to_param + project.id.should_not == fork_project.id fork_project.forked?.should be_true fork_project.forked_from_project.should == project - post api("/projects/#{fork_project.to_param}/merge_requests", user2), + post api("/projects/#{fork_project.id}/merge_requests", user2), title: 'Test merge_request', source_branch: "master", target_branch: "master", author: user2, target_project_id: project.id response.status.should == 201 json_response['title'].should == 'Test merge_request' end it "should return 400 when source_branch is missing" do - post api("/projects/#{fork_project.to_param}/merge_requests", user2), + post api("/projects/#{fork_project.id}/merge_requests", user2), title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id response.status.should == 400 end it "should return 400 when target_branch is missing" do - post api("/projects/#{fork_project.to_param}/merge_requests", user2), + post api("/projects/#{fork_project.id}/merge_requests", user2), title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id response.status.should == 400 end it "should return 400 when title is missing" do - post api("/projects/#{fork_project.to_param}/merge_requests", user2), + post api("/projects/#{fork_project.id}/merge_requests", user2), target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: project.id response.status.should == 400 end it "should return 400 when target_branch is specified and not a forked project" do - post api("/projects/#{project.to_param}/merge_requests", user), + post api("/projects/#{project.id}/merge_requests", user), title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user, target_project_id: fork_project.id response.status.should == 400 end it "should return 400 when target_branch is specified and for a different fork" do - post api("/projects/#{fork_project.to_param}/merge_requests", user2), + post api("/projects/#{fork_project.id}/merge_requests", user2), title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: unrelated_project.id response.status.should == 400 end it "should return 201 when target_branch is specified and for the same project" do - post api("/projects/#{fork_project.to_param}/merge_requests", user2), + post api("/projects/#{fork_project.id}/merge_requests", user2), title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: fork_project.id response.status.should == 201 end @@ -146,7 +146,7 @@ describe API::API do describe "PUT /projects/:id/merge_request/:merge_request_id to close MR" do it "should return merge_request" do - put api("/projects/#{project.to_param}/merge_request/#{merge_request.id}", user), state_event: "close" + put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), state_event: "close" response.status.should == 200 json_response['state'].should == 'closed' end @@ -154,7 +154,7 @@ describe API::API do describe "PUT /projects/:id/merge_request/:merge_request_id to merge MR" do it "should return merge_request" do - put api("/projects/#{project.to_param}/merge_request/#{merge_request.id}", user), state_event: "merge" + put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), state_event: "merge" response.status.should == 200 json_response['state'].should == 'merged' end @@ -162,19 +162,19 @@ describe API::API do describe "PUT /projects/:id/merge_request/:merge_request_id" do it "should return merge_request" do - put api("/projects/#{project.to_param}/merge_request/#{merge_request.id}", user), title: "New title" + put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), title: "New title" response.status.should == 200 json_response['title'].should == 'New title' end it "should return 422 when source_branch and target_branch are renamed the same" do - put api("/projects/#{project.to_param}/merge_request/#{merge_request.id}", user), + put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), source_branch: "master", target_branch: "master" response.status.should == 422 end it "should return merge_request with renamed target_branch" do - put api("/projects/#{project.to_param}/merge_request/#{merge_request.id}", user), target_branch: "wiki" + put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), target_branch: "wiki" response.status.should == 200 json_response['target_branch'].should == 'wiki' end @@ -182,18 +182,18 @@ describe API::API do describe "POST /projects/:id/merge_request/:merge_request_id/comments" do it "should return comment" do - post api("/projects/#{project.to_param}/merge_request/#{merge_request.id}/comments", user), note: "My comment" + post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user), note: "My comment" response.status.should == 201 json_response['note'].should == 'My comment' end it "should return 400 if note is missing" do - post api("/projects/#{project.to_param}/merge_request/#{merge_request.id}/comments", user) + post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user) response.status.should == 400 end it "should return 404 if note is attached to non existent merge request" do - post api("/projects/#{project.to_param}/merge_request/111/comments", user), note: "My comment" + post api("/projects/#{project.id}/merge_request/111/comments", user), note: "My comment" response.status.should == 404 end end -- cgit v1.2.1 From a5e19c4edcb8201cb33318cc0bec06a239694451 Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Tue, 24 Sep 2013 15:31:12 +0900 Subject: Update check script * GitLab Shell 1.7.1 is required * Global projects are not supported (refs #5152) --- lib/tasks/gitlab/check.rake | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 1e9228a3509..c445c0fbddd 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -22,6 +22,7 @@ namespace :gitlab do check_tmp_writable check_init_script_exists check_init_script_up_to_date + check_projects_have_namespace check_satellites_exist check_redis_version check_git_version @@ -552,6 +553,32 @@ namespace :gitlab do end end + def check_projects_have_namespace + print "projects have namespace: ... " + + unless Project.count > 0 + puts "can't check, you have no projects".magenta + return + end + puts "" + + Project.find_each(batch_size: 100) do |project| + print "#{project.name_with_namespace.yellow} ... " + + if project.namespace + puts "yes".green + else + puts "no".red + try_fixing_it( + "Migrate global projects" + ) + for_more_information( + "doc/update/5.4-to-6.0.md in section \"#global-projects\"" + ) + fix_and_rerun + end + end + end # Helper methods ######################## @@ -659,7 +686,7 @@ namespace :gitlab do end def check_gitlab_shell - required_version = Gitlab::VersionInfo.new(1, 7, 0) + required_version = Gitlab::VersionInfo.new(1, 7, 1) current_version = Gitlab::VersionInfo.parse(gitlab_shell_version) print "GitLab Shell version >= #{required_version} ? ... " -- cgit v1.2.1 From 35597f61aabc613e8b64c8f8e66999f8f3b3a8a6 Mon Sep 17 00:00:00 2001 From: Johannes Becker Date: Wed, 25 Sep 2013 00:56:25 +0200 Subject: Simple PivotalTracker Source Commits Service --- app/models/pivotaltracker_service.rb | 57 ++++++++++++++++++++++++++++++++++++ app/models/project.rb | 3 +- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 app/models/pivotaltracker_service.rb diff --git a/app/models/pivotaltracker_service.rb b/app/models/pivotaltracker_service.rb new file mode 100644 index 00000000000..eb7ea5f2113 --- /dev/null +++ b/app/models/pivotaltracker_service.rb @@ -0,0 +1,57 @@ +# == Schema Information +# +# Table name: services +# +# id :integer not null, primary key +# type :string(255) +# title :string(255) +# token :string(255) +# project_id :integer not null +# created_at :datetime not null +# updated_at :datetime not null +# active :boolean default(FALSE), not null +# + +class PivotaltrackerService < Service + include HTTParty + + attr_accessible :subdomain, :room + + validates :token, presence: true, if: :activated? + + def title + 'PivotalTracker' + end + + def description + 'Project Management Software (Source Commits Endpoint)' + end + + def to_param + 'pivotaltracker' + end + + def fields + [ + { type: 'text', name: 'token', placeholder: '' } + ] + end + + def execute(push) + url = 'https://www.pivotaltracker.com/services/v5/source_commits' + push[:commits].each do |commit| + message = {'source_commit' => + {'commit_id' => commit[:id], + 'author' => commit[:author][:name], + 'url' => commit[:url], + 'message' => commit[:message]} + } + status = PivotaltrackerService.post(url, + body: message.to_json, + headers: {'Content-Type' => 'application/json', + 'X-TrackerToken' => token} + ) + end + end + +end diff --git a/app/models/project.rb b/app/models/project.rb index f4d915179e8..63cd3505ec4 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -46,6 +46,7 @@ class Project < ActiveRecord::Base has_one :last_event, class_name: 'Event', order: 'events.created_at DESC', foreign_key: 'project_id' has_one :gitlab_ci_service, dependent: :destroy has_one :campfire_service, dependent: :destroy + has_one :pivotaltracker_service, dependent: :destroy has_one :hipchat_service, dependent: :destroy has_one :forked_project_link, dependent: :destroy, foreign_key: "forked_to_project_id" has_one :forked_from_project, through: :forked_project_link @@ -220,7 +221,7 @@ class Project < ActiveRecord::Base end def available_services_names - %w(gitlab_ci campfire hipchat) + %w(gitlab_ci campfire hipchat pivotaltracker) end def gitlab_ci? -- cgit v1.2.1 From 435a5ff8a1774c6feb2a683371ada0804318af11 Mon Sep 17 00:00:00 2001 From: Johannes Becker Date: Wed, 25 Sep 2013 01:09:33 +0200 Subject: Remove not needed attr_accessible --- app/models/pivotaltracker_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/pivotaltracker_service.rb b/app/models/pivotaltracker_service.rb index eb7ea5f2113..4efdafa9791 100644 --- a/app/models/pivotaltracker_service.rb +++ b/app/models/pivotaltracker_service.rb @@ -15,8 +15,6 @@ class PivotaltrackerService < Service include HTTParty - attr_accessible :subdomain, :room - validates :token, presence: true, if: :activated? def title -- cgit v1.2.1 From 64e012a378b657efd44fb7570e0924dfed64e008 Mon Sep 17 00:00:00 2001 From: Johannes Becker Date: Wed, 25 Sep 2013 16:49:39 +0200 Subject: Added spinach Tests for pivotaltracker service --- features/project/service.feature | 6 ++++++ features/steps/project/project_services.rb | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/features/project/service.feature b/features/project/service.feature index 6bb0c3e2c57..e685c385d1d 100644 --- a/features/project/service.feature +++ b/features/project/service.feature @@ -18,3 +18,9 @@ Feature: Project Services And I click hipchat service link And I fill hipchat settings Then I should see hipchat service settings saved + + Scenario: Activate pivotaltracker service + When I visit project "Shop" services page + And I click pivotaltracker service link + And I fill pivotaltracker settings + Then I should see pivotaltracker service settings saved diff --git a/features/steps/project/project_services.rb b/features/steps/project/project_services.rb index 10feb8ea8be..a24100ff8c0 100644 --- a/features/steps/project/project_services.rb +++ b/features/steps/project/project_services.rb @@ -44,4 +44,18 @@ class ProjectServices < Spinach::FeatureSteps find_field('Room').value.should == 'gitlab' end + + And 'I click pivotaltracker service link' do + click_link 'PivotalTracker' + end + + And 'I fill pivotaltracker settings' do + check 'Active' + fill_in 'Token', with: 'verySecret' + click_button 'Save' + end + + Then 'I should see pivotaltracker service settings saved' do + find_field('Token').value.should == 'verySecret' + end end -- cgit v1.2.1 From fa8588827e45946464298fb7e36f4dcd24f0c4fb Mon Sep 17 00:00:00 2001 From: Johannes Becker Date: Wed, 25 Sep 2013 16:54:34 +0200 Subject: Syntax cleanup --- app/models/pivotaltracker_service.rb | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/app/models/pivotaltracker_service.rb b/app/models/pivotaltracker_service.rb index 4efdafa9791..f28e142da77 100644 --- a/app/models/pivotaltracker_service.rb +++ b/app/models/pivotaltracker_service.rb @@ -38,18 +38,22 @@ class PivotaltrackerService < Service def execute(push) url = 'https://www.pivotaltracker.com/services/v5/source_commits' push[:commits].each do |commit| - message = {'source_commit' => - {'commit_id' => commit[:id], - 'author' => commit[:author][:name], - 'url' => commit[:url], - 'message' => commit[:message]} - } - status = PivotaltrackerService.post(url, - body: message.to_json, - headers: {'Content-Type' => 'application/json', - 'X-TrackerToken' => token} - ) + message = { + 'source_commit' => { + 'commit_id' => commit[:id], + 'author' => commit[:author][:name], + 'url' => commit[:url], + 'message' => commit[:message] + } + } + PivotaltrackerService.post( + url, + body: message.to_json, + headers: { + 'Content-Type' => 'application/json', + 'X-TrackerToken' => token + } + ) end end - end -- cgit v1.2.1