Maintainers and developers cannot rebase branches of internal forks
Summary
For merge requests created from a fork, maintainers and developers do not get the option to rebase the source branch when the merge method is set to fast-forward and possibly semi-linear as well.
Steps to reproduce
- Create a project with merge-method
fast-forward merge
. - Fork this project
- Create a merge-request
- Enable
Allow commits from members who can merge to the target branch
- Set visibility of fork to
internal
- Push new commits to target branch
- As a maintainer/developer of the original project, try to rebase this branch using the web interface.
What is the current bug behavior?
The user does not get the option to rebase
What is the expected correct behavior?
As the user is able to see the source project (the fork), I would expect them to be able to rebase the source branch. It should not be required for these projects to be public.
Results of GitLab environment info
Expand for output related to GitLab environment info
System information System: Current User: git Using RVM: no Ruby Version: 2.6.5p114 Gem Version: 3.0.3 Bundler Version:1.17.2 Rake Version: 12.3.3 Redis Version: unknown Git Version: 2.24.1 Sidekiq Version:5.2.7 Go Version: unknownGitLab information Version: 12.7.7 Revision: a5f0a62da6e Directory: /home/git/gitlab DB Adapter: PostgreSQL DB Version: 11.7 URL: https://gitlab.alpinelinux.org HTTP Clone URL: https://gitlab.alpinelinux.org/some-group/some-project.git SSH Clone URL: git@gitlab.alpinelinux.org:some-group/some-project.git Using LDAP: no Using Omniauth: yes Omniauth Providers: github, gitlab
GitLab Shell Version: 11.0.0 Repository storage paths:
- default: /home/git/repositories GitLab Shell path: /home/git/gitlab-shell Git: /usr/bin/git
Results of GitLab application Check
Expand for output related to the GitLab application check
Checking GitLab subtasks ...Checking GitLab Shell ...
GitLab Shell: ... GitLab Shell version >= 11.0.0 ? ... OK (11.0.0) Running /home/git/gitlab-shell/bin/check Internal API available: OK Redis available via internal API: OK gitlab-shell self-check successful
Checking GitLab Shell ... Finished
Checking Gitaly ...
Gitaly: ... default ... OK
Checking Gitaly ... Finished
Checking Sidekiq ...
Sidekiq: ... Running? ... yes Number of Sidekiq processes ... 1
Checking Sidekiq ... Finished
Checking Incoming Email ...
Incoming Email: ... Reply by email is disabled in config/gitlab.yml
Checking Incoming Email ... Finished
Checking LDAP ...
LDAP: ... LDAP is disabled in config/gitlab.yml
Checking LDAP ... Finished
Checking GitLab App ...
Git configured correctly? ... yes Database config exists? ... yes All migrations up? ... yes Database contains orphaned GroupMembers? ... no GitLab config exists? ... yes GitLab config up to date? ... yes Log directory writable? ... yes Tmp directory writable? ... yes Uploads directory exists? ... yes Uploads directory has correct permissions? ... yes Uploads directory tmp has correct permissions? ... yes Init script exists? ... no Try fixing it: Install the init script For more information see: doc/install/installation.md in section "Install Init Script" Please fix the error above and rerun the checks. Init script up-to-date? ... can't check because of previous errors Projects have namespace: ... 2/1 ... yes 1688/2 ... yes 1372/3 ... yes 2/4 ... yes 2/5 ... yes 2/6 ... yes 2/7 ... yes 1694/8 ... yes 7/9 ... yes 1706/11 ... yes 1732/13 ... yes 1732/14 ... yes 1732/15 ... yes 1688/17 ... yes 3/18 ... yes 1310/20 ... yes 1310/21 ... yes 1128/22 ... yes 314/23 ... yes 1048/25 ... yes 1590/26 ... yes 1747/27 ... yes 1747/28 ... yes 1747/29 ... yes 1747/30 ... yes 1590/31 ... yes 1732/34 ... yes 7/36 ... yes 1310/37 ... yes 1310/38 ... yes 169/39 ... yes 169/40 ... yes 169/42 ... yes 1732/43 ... yes 1438/44 ... yes 1602/45 ... yes 460/46 ... yes 653/47 ... yes 1794/48 ... yes 1450/49 ... yes 1808/51 ... yes 169/52 ... yes 1793/53 ... yes 1868/63 ... yes 1869/64 ... yes 980/65 ... yes 1877/66 ... yes 653/67 ... yes 1837/69 ... yes 1905/73 ... yes 1905/74 ... yes 1905/75 ... yes 1905/76 ... yes 1905/77 ... yes 1905/78 ... yes 1905/79 ... yes 1905/80 ... yes 1905/81 ... yes 1905/82 ... yes 1905/83 ... yes 1905/84 ... yes 1905/86 ... yes 1905/88 ... yes 1905/89 ... yes 1905/90 ... yes 1905/92 ... yes 1905/93 ... yes 1905/94 ... yes 1905/95 ... yes 1905/97 ... yes 1905/98 ... yes 1905/99 ... yes 1905/100 ... yes 1905/101 ... yes 1905/102 ... yes 1905/103 ... yes 1905/104 ... yes 1905/106 ... yes 1905/107 ... yes 1905/108 ... yes 1905/109 ... yes 1905/110 ... yes 1905/112 ... yes 1905/113 ... yes 1905/114 ... yes 1905/115 ... yes 1905/116 ... yes 1905/117 ... yes 1905/118 ... yes 1905/119 ... yes 1905/120 ... yes 1905/121 ... yes 1905/122 ... yes 1905/123 ... yes 1905/124 ... yes 1905/126 ... yes 1905/129 ... yes 1905/130 ... yes 1905/131 ... yes 1905/132 ... yes 1905/135 ... yes 1905/136 ... yes 1905/137 ... yes 1905/138 ... yes 1910/139 ... yes 1774/140 ... yes 1891/141 ... yes 1098/142 ... yes 1912/143 ... yes 65/146 ... yes 1098/148 ... yes 1935/149 ... yes 1901/150 ... yes 1941/151 ... yes 209/153 ... yes 1688/154 ... yes 1606/155 ... yes 980/156 ... yes 1952/157 ... yes 1732/159 ... yes 1267/160 ... yes 1960/162 ... yes 2075/164 ... yes 1732/165 ... yes 1732/167 ... yes 1969/168 ... yes 1960/171 ... yes 1424/172 ... yes 1717/173 ... yes 1732/177 ... yes 972/178 ... yes 1611/179 ... yes 1928/181 ... yes 1995/182 ... yes 1732/183 ... yes 1996/184 ... yes 1928/185 ... yes 1809/187 ... yes 1590/189 ... yes 1990/190 ... yes 1968/192 ... yes 1732/194 ... yes 1439/195 ... yes 1150/197 ... yes 1732/199 ... yes 430/201 ... yes 314/202 ... yes 1067/203 ... yes 2031/204 ... yes 902/206 ... yes 773/207 ... yes 1654/209 ... yes 1732/210 ... yes 1567/211 ... yes 965/212 ... yes 1732/213 ... yes 1732/214 ... yes 2056/215 ... yes 814/216 ... yes 2081/218 ... yes 2081/219 ... yes 2082/220 ... yes 682/221 ... yes 1217/222 ... yes 1282/223 ... yes 2084/224 ... yes 2093/226 ... yes 2027/227 ... yes 2096/228 ... yes 1577/229 ... yes 2100/230 ... yes 2102/231 ... yes 2104/232 ... yes 1043/233 ... yes 1968/234 ... yes 1550/236 ... yes 2075/237 ... yes 1688/238 ... yes 1796/239 ... yes 1732/240 ... yes 1748/241 ... yes 1732/242 ... yes 2116/244 ... yes 940/245 ... yes 807/246 ... yes 707/247 ... yes 2103/248 ... yes 7/249 ... yes 1984/250 ... yes 1804/251 ... yes 847/252 ... yes 2129/253 ... yes 2105/255 ... yes 2144/257 ... yes 2146/259 ... yes 1262/260 ... yes 2151/261 ... yes 1301/262 ... yes 2140/264 ... yes 2159/265 ... yes 1880/267 ... yes 2166/269 ... yes 2097/271 ... yes 1606/272 ... yes 2169/273 ... yes 1786/274 ... yes 2175/276 ... yes 2171/277 ... yes 2177/278 ... yes 2178/279 ... yes 2/280 ... yes 2180/281 ... yes 653/282 ... yes 2075/283 ... yes 1425/284 ... yes 2183/285 ... yes 2189/286 ... yes 2192/288 ... yes 2193/289 ... yes 2187/290 ... yes 1262/291 ... yes 2194/292 ... yes 2075/293 ... yes 1732/294 ... yes 2200/295 ... yes 2201/297 ... yes 1732/299 ... yes 1664/300 ... yes 882/301 ... yes 2209/302 ... yes 3/303 ... yes 1036/304 ... yes 980/305 ... yes 2212/306 ... yes 2216/308 ... yes 1099/309 ... yes 2181/311 ... yes 2221/312 ... yes 2215/313 ... yes 1732/314 ... yes 2234/316 ... yes 1432/320 ... yes 2212/321 ... yes 2247/322 ... yes 2247/323 ... yes 1717/324 ... yes 2207/325 ... yes 1606/326 ... yes 1953/329 ... yes 2266/330 ... yes 2267/331 ... yes 389/332 ... yes 2273/333 ... yes 1269/334 ... yes 1454/335 ... yes 2276/336 ... yes 1732/337 ... yes 2/338 ... yes 2281/339 ... yes 546/340 ... yes 2284/341 ... yes 1238/344 ... yes 1548/346 ... yes 956/347 ... yes 2293/349 ... yes 1732/350 ... yes 985/351 ... yes 2288/353 ... yes 1707/354 ... yes 2310/355 ... yes 1732/356 ... yes 919/357 ... yes 2102/358 ... yes 2319/359 ... yes 2322/361 ... yes 2330/362 ... yes 2087/364 ... yes 2247/365 ... yes 2137/366 ... yes 2337/367 ... yes 2338/369 ... yes 2339/370 ... yes 1877/371 ... yes 1877/372 ... yes 2342/374 ... yes 2343/375 ... yes 1732/380 ... yes 2170/381 ... yes 1757/383 ... yes 847/384 ... yes 3/385 ... yes 1606/386 ... yes 2362/387 ... yes 2372/388 ... yes 1982/389 ... yes 2379/394 ... yes 1672/395 ... yes 2385/396 ... yes 55/397 ... yes 847/398 ... yes 2384/400 ... yes 2388/401 ... yes 2389/402 ... yes 1611/403 ... yes 2397/405 ... yes 2196/409 ... yes 1303/410 ... yes 2409/411 ... yes 2411/412 ... yes 2412/414 ... yes 1732/416 ... yes 847/417 ... yes 2413/418 ... yes 1266/420 ... yes 2420/422 ... yes 2423/423 ... yes 2424/424 ... yes 2428/425 ... yes 169/426 ... yes 1370/427 ... yes 2380/430 ... yes 1606/431 ... yes 2436/432 ... yes 1606/433 ... yes 1606/434 ... yes 1732/435 ... yes 2441/436 ... yes 2449/437 ... yes 2450/438 ... yes Redis version >= 2.8.0? ... no Try fixing it: Update your redis server to a version >= 2.8.0 For more information see: gitlab-public-wiki/wiki/Trouble-Shooting-Guide in section sidekiq Please fix the error above and rerun the checks. Ruby version >= 2.5.3 ? ... yes (2.6.5) Git version >= 2.22.0 ? ... yes (2.24.1) Git user has default SSH configuration? ... yes Active users: ... 2359 Is authorized keys file accessible? ... yes
Checking GitLab App ... Finished
Checking GitLab subtasks ... Finished