Merge fails without error when "Fast-forward without a merge commit" and user doesn't have push permission
Summary
Merge failed without error on the front-end when "Fast-forward without a merge" was set
In gitlab-rails/production.log
the error states: MergeService ERROR: group/subgroup/project!8 - GitLab: You are not allowed to push code to protected branches on this project.<br>
Also after we removed branch protection Merge succeded but was not closed and when we try to close it manualy we get an error message:
Steps to reproduce
User Permissions:
- user is a master on the repository
Project settings:
General / Merge request settings
-
Fast-forward merge -
Merge Request approvals - Approvers:
- Users: /
- Group: one (1)
this is strange - on another group validators issue for example it's clearly visible it says how many users are there in a group and not the number of groups selected
https://gitlab.com/gitlab-org/gitlab-ee/issues/3142
Repository / Protected branches
- master
- Allowed to push: no one
- Allowed to merge: Developers + Master
What is the current bug behavior?
- When we try to merge the Merge request buttons spins indefinitely and the merge request does not complete.
- When we unprotected the branch the merge succeeded but it was not closed.
- Then when manually trying to close the MR we got an error
What is the expected correct behavior?
- Merging using Fast-forward should work even if you don't have push permission
- After the merge MR should close
Output of checks
Results of GitLab environment info
Expand for output related to GitLab environment info
System information System: Ubuntu 14.04 Proxy: no Current User: git Using RVM: no Ruby Version: 2.3.6p384 Gem Version: 2.6.13 Bundler Version:1.13.7 Rake Version: 12.3.0 Redis Version: 3.2.11 Git Version: 2.14.3 Sidekiq Version:5.0.5 Go Version: unknownGitLab information Version: 10.6.3-ee Revision: 8b1a92e Directory: /opt/gitlab/embedded/service/gitlab-rails DB Adapter: postgresql DB Version: 9.6.8 URL: https://git.qloud.io HTTP Clone URL: https://git.qloud.io/some-group/some-project.git SSH Clone URL: ssh://git@git.qloud.io:19780/some-group/some-project.git Elasticsearch: no Geo: no Using LDAP: yes Using Omniauth: yes Omniauth Providers: bitbucket
GitLab Shell Version: 6.0.4 Repository storage paths:
- default: /var/opt/gitlab/git-data/repositories Hooks: /opt/gitlab/embedded/service/gitlab-shell/hooks Git: /opt/gitlab/embedded/bin/git
Results of GitLab application Check
Expand for output related to the GitLab application check
Checking GitLab Shell ...GitLab Shell version >= 6.0.4 ? ... OK (6.0.4) Repo base directory exists? default... yes Repo storage directories are symlinks? default... no Repo paths owned by git:root, or git:git? default... yes Repo paths access is drwxrws---? default... yes hooks directories in repos are links: ... 6/2 ... ok 110/3 ... ok 112/4 ... ok 110/5 ... ok 5/6 ... ok 110/7 ... ok 5/8 ... ok 110/9 ... ok 5/10 ... ok 110/11 ... ok 5/12 ... ok 5/13 ... ok 110/14 ... ok 110/15 ... ok 110/16 ... ok 110/17 ... ok 5/18 ... ok 110/19 ... ok 110/20 ... ok 110/21 ... ok 5/23 ... ok 6/25 ... ok 11/26 ... ok 6/28 ... ok 15/29 ... ok 6/30 ... ok 15/31 ... ok 15/32 ... ok 15/33 ... ok 5/34 ... ok 110/35 ... ok 17/36 ... ok 5/37 ... ok 5/38 ... ok 5/39 ... ok 5/40 ... ok 5/41 ... ok 5/42 ... ok 5/43 ... ok 14/44 ... ok 5/45 ... ok 15/46 ... ok 5/47 ... ok 5/48 ... ok 7/49 ... ok 18/50 ... ok 7/52 ... ok 12/54 ... ok 7/55 ... ok 12/56 ... ok 12/57 ... ok 7/58 ... ok 12/59 ... ok 14/60 ... ok 7/61 ... ok 14/62 ... ok 5/63 ... ok 14/65 ... ok 14/66 ... ok 110/67 ... ok 12/69 ... ok 12/70 ... ok 14/71 ... ok 14/72 ... ok 14/73 ... ok 14/74 ... ok 12/75 ... ok 12/76 ... ok 12/77 ... ok 12/78 ... ok 14/79 ... ok 6/80 ... ok 14/81 ... ok 12/82 ... ok 12/83 ... ok 110/84 ... ok 12/85 ... ok 12/86 ... ok 110/88 ... ok 14/89 ... ok 12/90 ... ok 12/91 ... ok 21/92 ... ok 21/93 ... repository is empty 21/94 ... ok 21/95 ... ok 21/96 ... ok 21/97 ... ok 21/98 ... ok 21/99 ... ok 21/100 ... ok 110/101 ... ok 12/102 ... ok 12/103 ... ok 14/105 ... ok 14/106 ... ok 12/107 ... ok 12/108 ... ok 26/109 ... ok 10/110 ... ok 4/111 ... ok 7/113 ... ok 11/114 ... ok 11/115 ... ok 11/116 ... ok 5/119 ... ok 18/120 ... ok 14/121 ... ok 5/122 ... ok 112/123 ... ok 14/124 ... ok 14/125 ... ok 110/126 ... ok 7/127 ... ok 110/128 ... ok 110/129 ... ok 110/130 ... ok 12/131 ... ok 12/132 ... ok 12/133 ... ok 12/134 ... ok 5/135 ... ok 12/136 ... ok 12/137 ... ok 10/138 ... ok 14/140 ... ok 110/141 ... ok 14/142 ... ok 41/143 ... ok 14/144 ... ok 14/145 ... ok 5/146 ... ok 14/147 ... ok 10/148 ... ok 7/149 ... ok 10/150 ... ok 7/151 ... ok 41/152 ... ok 27/153 ... ok 7/154 ... ok 12/155 ... ok 7/156 ... ok 14/157 ... ok 5/158 ... ok 12/159 ... ok 7/160 ... ok 7/161 ... ok 7/162 ... ok 10/164 ... ok 4/165 ... ok 6/166 ... ok 7/167 ... ok 11/168 ... ok 14/169 ... ok 11/172 ... ok 11/173 ... ok 26/174 ... ok 11/177 ... ok 11/178 ... ok 14/179 ... ok 12/180 ... ok 6/181 ... ok 14/183 ... ok 29/184 ... ok 32/185 ... ok 7/186 ... ok 7/187 ... ok 7/188 ... ok 7/189 ... ok 7/190 ... ok 7/191 ... ok 7/192 ... ok 7/193 ... ok 7/194 ... ok 11/195 ... ok 27/197 ... ok 110/198 ... ok 7/199 ... ok 11/201 ... ok 6/202 ... ok 7/203 ... ok 11/204 ... ok 5/205 ... ok 1/206 ... repository is empty 5/207 ... ok 7/208 ... ok 6/209 ... ok 5/210 ... ok 38/211 ... ok 39/212 ... ok 4/213 ... ok 39/214 ... ok 39/215 ... ok 11/216 ... ok 11/217 ... ok 6/218 ... ok 6/219 ... ok 11/220 ... ok 41/222 ... ok 6/225 ... ok 27/226 ... ok 11/227 ... ok 4/228 ... repository is empty 5/229 ... ok 39/231 ... ok 6/232 ... ok 5/233 ... ok 60/234 ... ok 41/235 ... ok 5/236 ... ok 110/237 ... ok 5/238 ... ok 110/239 ... ok 27/240 ... ok 27/241 ... ok 110/243 ... ok 110/244 ... ok 110/245 ... ok 27/246 ... ok 110/247 ... ok 27/248 ... ok 5/249 ... ok 5/250 ... ok 2/251 ... ok 5/252 ... ok 110/253 ... ok 29/254 ... ok 5/255 ... ok 110/256 ... ok 29/257 ... ok 29/258 ... ok 6/259 ... ok 29/260 ... ok 7/261 ... ok 5/262 ... ok 5/263 ... ok 110/264 ... repository is empty 6/265 ... ok 38/266 ... ok 5/267 ... ok 29/268 ... ok 29/269 ... ok 2/270 ... ok 29/272 ... ok 29/273 ... ok 110/274 ... ok 110/275 ... ok 5/276 ... ok 4/277 ... repository is empty 29/278 ... ok 60/279 ... ok 60/280 ... ok 60/281 ... ok 60/282 ... ok 60/283 ... ok 60/284 ... ok 60/285 ... ok 60/286 ... ok 60/287 ... ok 60/288 ... ok 60/289 ... ok 60/290 ... ok 60/291 ... ok 60/292 ... ok 60/293 ... ok 60/294 ... ok 60/295 ... ok 60/296 ... ok 60/297 ... ok 60/298 ... ok 60/299 ... ok 60/300 ... ok 60/301 ... ok 60/303 ... ok 60/304 ... ok 60/305 ... ok 60/306 ... ok 60/307 ... ok 60/308 ... ok 60/309 ... ok 60/310 ... ok 29/311 ... ok 60/312 ... repository is empty 60/313 ... ok 60/314 ... ok 60/315 ... ok 60/316 ... ok 60/317 ... ok 60/318 ... ok 60/319 ... ok 60/321 ... ok 60/322 ... ok 60/323 ... ok 60/324 ... ok 60/325 ... ok 60/326 ... ok 60/327 ... ok 60/328 ... ok 60/329 ... ok 60/330 ... ok 60/331 ... ok 60/332 ... ok 60/333 ... ok 60/334 ... ok 29/335 ... ok 46/336 ... repository is empty 11/337 ... ok 41/338 ... ok 5/339 ... ok 5/340 ... ok 29/341 ... ok 5/342 ... ok 5/343 ... ok 65/344 ... ok 68/345 ... ok 29/346 ... repository is empty 29/347 ... repository is empty 31/348 ... ok 69/349 ... ok 69/350 ... ok 5/352 ... ok 71/353 ... ok 69/354 ... ok 6/355 ... ok 68/356 ... ok 5/357 ... ok 69/358 ... ok 5/359 ... repository is empty 69/361 ... ok 69/362 ... ok 27/363 ... ok 110/364 ... ok 80/365 ... repository is empty 80/366 ... ok 80/367 ... ok 27/369 ... ok 11/370 ... ok 21/372 ... ok 69/373 ... ok 5/374 ... repository is empty 29/375 ... ok 110/376 ... ok 80/377 ... ok 69/378 ... ok 27/379 ... ok 12/380 ... ok 2/381 ... ok 27/383 ... ok 110/384 ... ok 5/385 ... ok 80/387 ... ok 80/388 ... ok 107/389 ... ok 110/390 ... repository is empty 5/391 ... repository is empty 117/392 ... ok 118/393 ... repository is empty Running /opt/gitlab/embedded/service/gitlab-shell/bin/check Check GitLab API access: OK Redis available via internal API: OK
Access to /var/opt/gitlab/.ssh/authorized_keys: OK gitlab-shell self-check successful
Checking GitLab Shell ... Finished
Checking Sidekiq ...
Running? ... yes Number of Sidekiq processes ... 1
Checking Sidekiq ... Finished
Reply by email is disabled in config/gitlab.yml Checking LDAP ...
Server: ldapmain not verifying SSL hostname of LDAPS server 'ipa.kupi.lan:636' LDAP authentication... Success LDAP users with access to your GitLab server (only showing the first 100 results)
Checking LDAP ... Finished
Checking GitLab ...
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? ... skipped (omnibus-gitlab has no init script) Init script up-to-date? ... skipped (omnibus-gitlab has no init script) Projects have namespace: ... 6/2 ... yes 110/3 ... yes 112/4 ... yes 110/5 ... yes 5/6 ... yes 110/7 ... yes 5/8 ... yes 110/9 ... yes 5/10 ... yes 110/11 ... yes 5/12 ... yes 5/13 ... yes 110/14 ... yes 110/15 ... yes 110/16 ... yes 110/17 ... yes 5/18 ... yes 110/19 ... yes 110/20 ... yes 110/21 ... yes 5/23 ... yes 6/25 ... yes 11/26 ... yes 6/28 ... yes 15/29 ... yes 6/30 ... yes 15/31 ... yes 15/32 ... yes 15/33 ... yes 5/34 ... yes 110/35 ... yes 17/36 ... yes 5/37 ... yes 5/38 ... yes 5/39 ... yes 5/40 ... yes 5/41 ... yes 5/42 ... yes 5/43 ... yes 14/44 ... yes 5/45 ... yes 15/46 ... yes 5/47 ... yes 5/48 ... yes 7/49 ... yes 18/50 ... yes 7/52 ... yes 12/54 ... yes 7/55 ... yes 12/56 ... yes 12/57 ... yes 7/58 ... yes 12/59 ... yes 14/60 ... yes 7/61 ... yes 14/62 ... yes 5/63 ... yes 14/65 ... yes 14/66 ... yes 110/67 ... yes 12/69 ... yes 12/70 ... yes 14/71 ... yes 14/72 ... yes 14/73 ... yes 14/74 ... yes 12/75 ... yes 12/76 ... yes 12/77 ... yes 12/78 ... yes 14/79 ... yes 6/80 ... yes 14/81 ... yes 12/82 ... yes 12/83 ... yes 110/84 ... yes 12/85 ... yes 12/86 ... yes 110/88 ... yes 14/89 ... yes 12/90 ... yes 12/91 ... yes 21/92 ... yes 21/93 ... yes 21/94 ... yes 21/95 ... yes 21/96 ... yes 21/97 ... yes 21/98 ... yes 21/99 ... yes 21/100 ... yes 110/101 ... yes 12/102 ... yes 12/103 ... yes 14/105 ... yes 14/106 ... yes 12/107 ... yes 12/108 ... yes 26/109 ... yes 10/110 ... yes 4/111 ... yes 7/113 ... yes 11/114 ... yes 11/115 ... yes 11/116 ... yes 5/119 ... yes 18/120 ... yes 14/121 ... yes 5/122 ... yes 112/123 ... yes 14/124 ... yes 14/125 ... yes 110/126 ... yes 7/127 ... yes 110/128 ... yes 110/129 ... yes 110/130 ... yes 12/131 ... yes 12/132 ... yes 12/133 ... yes 12/134 ... yes 5/135 ... yes 12/136 ... yes 12/137 ... yes 10/138 ... yes 14/140 ... yes 110/141 ... yes 14/142 ... yes 41/143 ... yes 14/144 ... yes 14/145 ... yes 5/146 ... yes 14/147 ... yes 10/148 ... yes 7/149 ... yes 10/150 ... yes 7/151 ... yes 41/152 ... yes 27/153 ... yes 7/154 ... yes 12/155 ... yes 7/156 ... yes 14/157 ... yes 5/158 ... yes 12/159 ... yes 7/160 ... yes 7/161 ... yes 7/162 ... yes 10/164 ... yes 4/165 ... yes 6/166 ... yes 7/167 ... yes 11/168 ... yes 14/169 ... yes 11/172 ... yes 11/173 ... yes 26/174 ... yes 11/177 ... yes 11/178 ... yes 14/179 ... yes 12/180 ... yes 6/181 ... yes 14/183 ... yes 29/184 ... yes 32/185 ... yes 7/186 ... yes 7/187 ... yes 7/188 ... yes 7/189 ... yes 7/190 ... yes 7/191 ... yes 7/192 ... yes 7/193 ... yes 7/194 ... yes 11/195 ... yes 27/197 ... yes 110/198 ... yes 7/199 ... yes 11/201 ... yes 6/202 ... yes 7/203 ... yes 11/204 ... yes 5/205 ... yes 1/206 ... yes 5/207 ... yes 7/208 ... yes 6/209 ... yes 5/210 ... yes 38/211 ... yes 39/212 ... yes 4/213 ... yes 39/214 ... yes 39/215 ... yes 11/216 ... yes 11/217 ... yes 6/218 ... yes 6/219 ... yes 11/220 ... yes 41/222 ... yes 6/225 ... yes 27/226 ... yes 11/227 ... yes 4/228 ... yes 5/229 ... yes 39/231 ... yes 6/232 ... yes 5/233 ... yes 60/234 ... yes 41/235 ... yes 5/236 ... yes 110/237 ... yes 5/238 ... yes 110/239 ... yes 27/240 ... yes 27/241 ... yes 110/243 ... yes 110/244 ... yes 110/245 ... yes 27/246 ... yes 110/247 ... yes 27/248 ... yes 5/249 ... yes 5/250 ... yes 2/251 ... yes 5/252 ... yes 110/253 ... yes 29/254 ... yes 5/255 ... yes 110/256 ... yes 29/257 ... yes 29/258 ... yes 6/259 ... yes 29/260 ... yes 7/261 ... yes 5/262 ... yes 5/263 ... yes 110/264 ... yes 6/265 ... yes 38/266 ... yes 5/267 ... yes 29/268 ... yes 29/269 ... yes 2/270 ... yes 29/272 ... yes 29/273 ... yes 110/274 ... yes 110/275 ... yes 5/276 ... yes 4/277 ... yes 29/278 ... yes 60/279 ... yes 60/280 ... yes 60/281 ... yes 60/282 ... yes 60/283 ... yes 60/284 ... yes 60/285 ... yes 60/286 ... yes 60/287 ... yes 60/288 ... yes 60/289 ... yes 60/290 ... yes 60/291 ... yes 60/292 ... yes 60/293 ... yes 60/294 ... yes 60/295 ... yes 60/296 ... yes 60/297 ... yes 60/298 ... yes 60/299 ... yes 60/300 ... yes 60/301 ... yes 60/303 ... yes 60/304 ... yes 60/305 ... yes 60/306 ... yes 60/307 ... yes 60/308 ... yes 60/309 ... yes 60/310 ... yes 29/311 ... yes 60/312 ... yes 60/313 ... yes 60/314 ... yes 60/315 ... yes 60/316 ... yes 60/317 ... yes 60/318 ... yes 60/319 ... yes 60/321 ... yes 60/322 ... yes 60/323 ... yes 60/324 ... yes 60/325 ... yes 60/326 ... yes 60/327 ... yes 60/328 ... yes 60/329 ... yes 60/330 ... yes 60/331 ... yes 60/332 ... yes 60/333 ... yes 60/334 ... yes 29/335 ... yes 46/336 ... yes 11/337 ... yes 41/338 ... yes 5/339 ... yes 5/340 ... yes 29/341 ... yes 5/342 ... yes 5/343 ... yes 65/344 ... yes 68/345 ... yes 29/346 ... yes 29/347 ... yes 31/348 ... yes 69/349 ... yes 69/350 ... yes 5/352 ... yes 71/353 ... yes 69/354 ... yes 6/355 ... yes 68/356 ... yes 5/357 ... yes 69/358 ... yes 5/359 ... yes 69/361 ... yes 69/362 ... yes 27/363 ... yes 110/364 ... yes 80/365 ... yes 80/366 ... yes 80/367 ... yes 27/369 ... yes 11/370 ... yes 21/372 ... yes 69/373 ... yes 5/374 ... yes 29/375 ... yes 110/376 ... yes 80/377 ... yes 69/378 ... yes 27/379 ... yes 12/380 ... yes 2/381 ... yes 27/383 ... yes 110/384 ... yes 5/385 ... yes 80/387 ... yes 80/388 ... yes 107/389 ... yes 110/390 ... yes 5/391 ... yes 117/392 ... yes 118/393 ... yes Redis version >= 2.8.0? ... yes Ruby version >= 2.3.5 ? ... yes (2.3.6) Git version >= 2.9.5 ? ... yes (2.14.3) Git user has default SSH configuration? ... yes Active users: ... 65 Elasticsearch version 5.1 - 5.5? ... skipped (elasticsearch is disabled)
Checking GitLab ... Finished