Merge always in progress

After upgrading my GitLab server from 7.9 to 8.0.2, everything seems OK, but some repo have some issue when accept merge request.

When I try to accept the merge request, the Merge button always display "Merge in progress" and will never complete.

When I check the logs, I find out that the sidekiq worker has already done the merge process, but the webpage will never change.

And when you check the code again, you will find out that the merge is already applied on the master branch, but the merge request status is still open.

And the only different between this repo and another is that when I use web edit to commit some change, the page will always show " Something went wrong. Your changes were not committed".

/cc:#2572 (closed)

Can confirm this issue, same happens for me in 8.0.4. Merge requests seem to hang, doesn't remove the branch and show it as merged. Even though it still merges and closes relevant tickets.

Still in 8.0.5.

Still in 8.1.0

Is anything needed to get this in the picture, to get to the problem? It's quite annoying to close merge requests manually and have gitlab say they are not merged, even when they are. Let alone the manual labor of removing branches (first world problems ;)).

Just had two merge requests succeed, the next one failing again. Branch didn't get removed automatically, even though I ticked the box. It seems completely random to me, if I can help you with any information let me know.

mentioned in issue #3078 (closed)

Are you using JIRA integration, by chance?

@dblessing For me, I didn't use any type of CI, including the embaded GitLab CI

@dblessing I am running into this issue when using JIRA integration. Is it a known problem?

Currently on 8.2.2 and I do not have the problem anymore, what changed?

@tmggitlab If all fields are not configured I have seen this happen. Make sure you have all URL fields filled in.

I'm using Redmine integration on 8.3.2 and I have this same issue. For some reason the merge was rejected by pre-receive hook and I'm stuck with this merge in progress. I restarted Gitlab CE + Postgres + Redis and created another MR from the same branch to master and it went through. Now I don't know what to do with this MR stuck in progress. I removed the source branch but it doesn't work. Is there a way to cancel/abort this?

@dblessing - We upgraded to GitLab 8.3.4 yesterday and are facing the same symptoms as mentioned in the issue summary above: clicking on the Merge button gets stuck in the 'Merge in Progress' status. The log indicates that the worker thread gets done pretty quickly, the actual merge goes through and the changes are visible on the target branch from the command line. But the UI does not refresh to indicate that the changes have been merged. Also tried to close and reopen the MR, but it continues showing that the merge has not happened. Any pointers to how we can get around this? Please let me know if I can provide more information about this- this currently blocks our capability to use GitLab UI altogether. Please let me know if there are any configuration parameters that we need to revisit (we upgraded from 7.x to 8.x). Thanks in advance!

mentioned in issue #18048 (closed)

I have experienced this issue as well; my context is on a private gitlab repo hosted on gitlab.com, this is the MR where I most recently observed this issue.

Some pics:

As stated before, merge in progress spins and spins but the merge goes through and my team (of two devs) can fetch all from master and pull.

After a navigating away from the page and loading the merge requests, my MR popped up in the Merged list - so it eventually got to where it needed to go, but I have observed this behavior before and the MR never ended up in the Merged tab (perhaps that got fixed in a new release?). I can't think for the life of me what I did differently on some of these merge requests... perhaps I didn't populate the Assignees?

We are currently seeing this on Gitlab CE 8.9 with two MR to completely different projects. There are entries in the production.log file for both merges kicking off but no other mentions. Gitlab CE is running on AWS. Both have been going for more than an hour now.

Same for the cloud gitlab. Accept merge request does not work anymore.

Same for gitlab 8.11.8

Experiencing this again with my project's Merge Request 119

Gonna merge manually to workaround it.

In this last case, I kept the tab open and it eventually seemed to work itself out. That is different than before. Before, it would keep spinning even after a merge was done. I am unsure if this was becauseI manually merged and pushed to gitlab.com or if the job on gitlab's backend finished.

I'm also having this on a private repro at GitLab.com .

Button says "Merge in progress" but if I refresh the page the button goes back to "Accept merge request". I click it, it changes to "Merge in progress" etc' etc' all over again.

I have the same issue on Gitlab.com, since this is a crucial part of our workflow we will have to move to Github if we can't resolve it.

same here

/cc @mattl

Added reproduced on GitLab.com label

@bjesus Can you tell me about your private repo? I can take a look at it for you.

@vikeri Can you link to your repo too?

Reassigned to @mattl

@mattl Sure! What's your email address?

Mentioned in issue #23568 (closed)

@vikeri You can link it here, or mattl at gitlab.com

Mentioned in issue #23893 (closed)

Great! I sent you an email now!

https://gitlab.com/pilloxa/pilloxa-app is @vikeri's repo.

@mattl I encountered an issue that could be related:

1. I clicked "Merge" on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7185, and on the MR page, which I didn't reload, I still see "Merge in progress":

   but if you open the MR page yourself, you will just see the MR as not merged.

2. When checking the MR state via the API, interestingly I got "state": "reopened" which means that the MR transitioned from :open to :locked via the :lock_mr event (https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/services/merge_requests/merge_service.rb#L16), but then the merge failed for some reason and then got unlocked thanks to https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/models/merge_request.rb#L741

I think we have a good candidate to understand what's going on here:

• we should check merge_request.merge_error since it's not exposed via the API (and probably expose it in the future)
• we could also check the logs and look for MergeService ERROR: gitlab-org/gitlab-ce!7185 => we should see the same error as the one from merge_request.merge_error
• we should improve the frontend to handle this case: the merge error should be displayed or at least a message should be displayed to tell me that the merge was unsuccessful

Note: In my case, the MR was not merged to master, in contrary to the original issue description:

And when you check the code again, you will find out that the merge is already applied on the master branch, but the merge request status is still open.

Ok, I will merge !7185 (merged), the error was => "Something went wrong during merge: Could not update branch master. Please refresh and try again.".

@rymai Very interesting. This indicates for some reason the shell out to git failed. Perhaps we need to show the return code? /cc: @jacobvosmaer-gitlab

# app/models/repository.rb
class Repository
  # ...
  def update_ref!(name, newrev, oldrev)
    # ...
    command = %w[git update-ref --stdin -z]
    _, status = Gitlab::Popen.popen(command, path_to_repo) do |stdin|
      stdin.write("update #{name}\x00#{newrev}\x00#{oldrev}\x00")
    end

    return if status.zero?

    raise CommitError.new("Could not update branch #{name.sub('refs/heads/', '')}. Please refresh and try again.")
  end
end

We could perhaps capture the output (instead of assigning to _) and throw it in githost.log before we raise CommitError.new.

I am not sure about throwing the error into the web interface.

@jacobvosmaer-gitlab Yes, logging would definitely help here!

Mentioned in issue #24854 (closed)

Mentioned in merge request !7662 (closed)

I'm experiencing the same issue on 8.13.9.

This issue can be reproduced by a rejection of a git hook ( in my case, it is update hook) 8.14.2. I have checked the sidekiq log and found the merge job has completed but the UI of merge request just hangs in "merge in process". However other parts of the UI still works.

mentioned in issue #26046 (closed)

I've been experiencing this issue with gitlab.com.

I am experiencing this with a fresh repo right now as well. E: since its a personal repo, I ended up just force pushing.

mentioned in issue #26028 (closed)

I've encountered this issue on GitLab.com for MR !10099 (closed) which was set to "merge when pipeline succeeds" but after the pipeline completed, it got stuck on "merge in progress" for over 12 hours and counting as of this comment.

@smcgivern indicated on slack that the lock should timeout after 24 hours, so I suppose at that point I can close the MR.

Removing @mattl from this issue assignment since he is no longer with the company

added ~480950 ~12980 ~13921 labels

removed assignee

@mikegreiling that's right! I think it would be good to track the JID of the Sidekiq job for the merge, so we can know what's happening with the job itself, in cases like this: https://gitlab.com/gitlab-org/gitlab-ce/issues/17709#note_26058256

got same issue, using gitlab CE 9.0.0, whi CI and JIRA, when accepting merge request, it just stays in "Merge in progress" and keeps creating multiple merge commit messages, if i close the window where i accepted merge request it seems to stop, but merge request stays open nad show that no changes available...

@dima.savickij I believe you're running into https://gitlab.com/gitlab-org/gitlab-ce/issues/29114 / https://gitlab.com/gitlab-org/gitlab-ce/issues/29123 - in other words, there's an unhandled error when trying to update JIRA, and that's causing the problem. I'd recommend following those issues for updates.

got same issue in gitlab CE 9.1.4

moved to gitlab#3863

Hey! 👋

GitLab is moving all development for both GitLab Community Edition and Enterprise Edition into a single codebase. The current gitlab-ce repository will become a read-only mirror, without any proprietary code. All development is moved to the current gitlab-ee repository, which we will rename to just gitlab in the coming weeks. As part of this migration, issues will be moved to the current gitlab-ee project.

If you have any questions about all of this, please ask them in our dedicated FAQ issue.

https://gitlab.com/gitlab-org/gitlab-ee/issues/13855

You can also find more information here:

• https://gitlab.com/gitlab-org/gitlab-ee/issues/13304
• https://about.gitlab.com/2019/08/23/a-single-codebase-for-gitlab-community-and-enterprise-edition/

Frequently Asked Questions

For an up to date list of questions and answers, please take a look at https://gitlab.com/gitlab-org/gitlab-ee/issues/13855

What will we do with the repository names?

https://gitlab.com/gitlab-org/gitlab-ee/ will become https://gitlab.com/gitlab-org/gitlab, and https://gitlab.com/gitlab-org/gitlab-ce will become https://gitlab.com/gitlab-org/gitlab-foss.

Why rename gitlab-ce to gitlab-foss?

Using "gitlab" and "gitlab-ce" would be confusing, so we decided to rename gitlab-ce to gitlab-foss to make the purpose of this FOSS repository more clear

I created a merge requests for CE, and this got closed. What do I need to do?

You will need to create a merge request at https://gitlab.com/gitlab-org/gitlab-ee/. This link will eventually redirect to https://gitlab.com/gitlab-org/gitlab.

How does the licensing work in this new setup?

Everything in the ee/ directory is proprietary. Everything else is free and open source software. If your merge request does not change anything in the ee/ directory, the process of contributing changes is the same as when using the gitlab-ce repository.

Will you accept merge requests on the gitlab-ce/gitlab-foss project after it has been renamed?

No. Merge requests submitted to this project will be closed automatically.

Will I still be able to view old issues and merge requests in gitlab-ce/gitlab-foss?

Yes.

How will this affect users of GitLab CE using Omnibus?

No changes will be necessary, as the packages built remain the same.

How will this affect users of GitLab CE that build from source?

Once the project has been renamed, you will need to change your Git remotes to use this new URL. GitLab will take care of redirecting Git operations so there is no hard deadline, but we recommend doing this as soon as the projects have been renamed.

Where can I see a timeline of the remaining steps?

https://gitlab.com/gitlab-org/gitlab-ee/issues/13304

Will community contributions submitted to the new "gitlab" repository be available in the new gitlab-foss repository?

Yes, these changes will be synced to gitlab-foss automatically, several times per day.

locked this issue