From 744e0eddf86a71b11584701ca4aa9dfc54e4a581 Mon Sep 17 00:00:00 2001 From: zhangxunhui Date: Mon, 30 Jan 2023 14:32:14 +0800 Subject: [PATCH] update two services --- app/controllers/pull_requests_controller.rb | 1 - app/services/gitea/commit/diff_service.rb | 2 +- app/services/gitea/commit/info_service.rb | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index ce84b6c2..6c56f021 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -263,7 +263,6 @@ class PullRequestsController < ApplicationController else # update issue to state 5 issue.update(status_id: 5) - normal_status(1, "合并成功") end end end diff --git a/app/services/gitea/commit/diff_service.rb b/app/services/gitea/commit/diff_service.rb index 67abd39e..71230250 100644 --- a/app/services/gitea/commit/diff_service.rb +++ b/app/services/gitea/commit/diff_service.rb @@ -22,7 +22,7 @@ class Gitea::Commit::DiffService < Gitea::ClientService private def params - Hash.new.merge(token: owner) + Hash.new.merge(token: token) end def url diff --git a/app/services/gitea/commit/info_service.rb b/app/services/gitea/commit/info_service.rb index 8598f4e8..587d4a3e 100644 --- a/app/services/gitea/commit/info_service.rb +++ b/app/services/gitea/commit/info_service.rb @@ -7,7 +7,7 @@ class Gitea::Commit::InfoService < Gitea::ClientService # repo: 仓库名称/标识 # sha: commit唯一标识 # eg: - # Gitea::Commit::InfoService.call('jasder', 'repo_identifier', 'sha value') + # Gitea::Commit::InfoService.call('jasder', 'repo_identifier', 'sha value', token='gitea token') def initialize(owner, repo, sha, token=nil) @owner = owner @repo = repo @@ -22,7 +22,7 @@ class Gitea::Commit::InfoService < Gitea::ClientService private def params - Hash.new.merge(token: owner) + Hash.new.merge(token: token) end def url