File tree Expand file tree Collapse file tree 1 file changed +2
-16
lines changed Expand file tree Collapse file tree 1 file changed +2
-16
lines changed Original file line number Diff line number Diff line change 1
- use crate :: github:: api:: base_github_url;
2
1
use http:: StatusCode ;
3
2
use octocrab:: params:: repos:: Reference ;
4
3
use thiserror:: Error ;
@@ -42,19 +41,7 @@ pub async fn merge_branches(
42
41
commit_message : & str ,
43
42
) -> Result < CommitSha , MergeError > {
44
43
let client = repo. client ( ) ;
45
- let merge_url = repo
46
- . repository
47
- . merges_url
48
- . as_ref ( )
49
- . map ( |url| url. to_string ( ) )
50
- . unwrap_or_else ( || {
51
- format ! (
52
- "{}/repos/{}/{}/merges" ,
53
- base_github_url( ) ,
54
- repo. name( ) . owner,
55
- repo. name( ) . name
56
- )
57
- } ) ;
44
+ let merge_url = format ! ( "/repos/{}/{}/merges" , repo. name( ) . owner, repo. name( ) . name) ;
58
45
59
46
let request = MergeRequest {
60
47
base : base_ref,
@@ -150,8 +137,7 @@ async fn update_branch(
150
137
sha : & CommitSha ,
151
138
) -> Result < ( ) , BranchUpdateError > {
152
139
let url = format ! (
153
- "{}/repos/{}/{}/git/refs/{}" ,
154
- base_github_url( ) ,
140
+ "/repos/{}/{}/git/refs/{}" ,
155
141
repo. name( ) . owner( ) ,
156
142
repo. name( ) . name( ) ,
157
143
Reference :: Branch ( branch_name. clone( ) ) . ref_url( )
You can’t perform that action at this time.
0 commit comments