GitLab

Created by: agjmills

Using stable-7-3

When I click 'Accept merge request' the page refreshes after a couple of seconds and the MR has not been merged

In githost.log I get the following:

November 03, 2014 14:15 -> ERROR -> Command failed [1]: /usr/bin/git --git-dir=/home/gitlab/gitlab-satellites/amills/test/.git --work-tree=/home/gitlab/gitlab-satellites/amills/test push origin master

remote: /usr/local/rvm/gems/ruby-2.1.2/gems/bundler-1.7.0/lib/bundler/spec_set.rb:92:in `block in materialize': Could not find gitlab-grit-2.6.11 in any of the sources (Bundler::GemNotFound)
remote:     from /usr/local/rvm/gems/ruby-2.1.2/gems/bundler-1.7.0/lib/bundler/spec_set.rb:85:in `map!'
remote:     from /usr/local/rvm/gems/ruby-2.1.2/gems/bundler-1.7.0/lib/bundler/spec_set.rb:85:in `materialize'
remote:     from /usr/local/rvm/gems/ruby-2.1.2/gems/bundler-1.7.0/lib/bundler/definition.rb:132:in `specs'
remote:     from /usr/local/rvm/gems/ruby-2.1.2/gems/bundler-1.7.0/lib/bundler/definition.rb:177:in `specs_for'
remote:     from /usr/local/rvm/gems/ruby-2.1.2/gems/bundler-1.7.0/lib/bundler/definition.rb:166:in `requested_specs'
remote:     from /usr/local/rvm/gems/ruby-2.1.2/gems/bundler-1.7.0/lib/bundler/environment.rb:18:in `requested_specs'
remote:     from /usr/local/rvm/gems/ruby-2.1.2/gems/bundler-1.7.0/lib/bundler/runtime.rb:13:in `setup'
remote:     from /usr/local/rvm/gems/ruby-2.1.2/gems/bundler-1.7.0/lib/bundler.rb:121:in `setup'
remote:     from /usr/local/rvm/gems/ruby-2.1.2/gems/bundler-1.7.0/lib/bundler/setup.rb:17:in `<top (required)>'
remote:     from /usr/local/rvm/rubies/ruby-1.9.3-p448/lib/ruby/site_ruby/1.9.1/rubygems/core_ext/kernel_require.rb:55:in `require'
remote:     from /usr/local/rvm/rubies/ruby-1.9.3-p448/lib/ruby/site_ruby/1.9.1/rubygems/core_ext/kernel_require.rb:55:in `require'
To /home/gitlab/repositories/amills/test.git
 ! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to '/home/gitlab/repositories/amills/test.git'

Created by: cirosantilli

possible duplicate of https://github.com/gitlabhq/gitlabhq/issues/8045

By Administrator on 2014-11-03T15:13:15 (imported from GitLab project)

Created by: favadi

I also have this problem, but I don' use rvm (but do have ruby1.8 and ruby2.1 installed).

The error:

November 04, 2014 08:51 -> ERROR -> Command failed [1]: git --git-dir=/home/gitlab/gitlab-satellites/favadi/test/.git --work-tree=/home/gitlab/gitlab-satellites/favadi/test push origin master

remote: /var/lib/gems/2.1.0/gems/bundler-1.7.3/lib/bundler/definition.rb:22:in `build': /home/gitlab/repositories/favadi/test.git/Gemfile not found (Bundler::GemfileNotFound)
remote:         from /var/lib/gems/2.1.0/gems/bundler-1.7.3/lib/bundler.rb:154:in `definition'
remote:         from /var/lib/gems/2.1.0/gems/bundler-1.7.3/lib/bundler.rb:117:in `setup'
remote:         from /var/lib/gems/2.1.0/gems/bundler-1.7.3/lib/bundler/setup.rb:17:in `<top (required)>'
remote:         from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
remote:         from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
To /home/gitlab/repositories/favadi/test.git
 ! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to '/home/gitlab/repositories/favadi/test.git'

gitlab-shell config:

---
user: gitlab
gitlab_url: https://git.mycompany.com/
http_settings:
  self_signed_cert: false
repos_path: "/home/gitlab/repositories/"
auth_file: "/home/gitlab/.ssh/authorized_keys"
redis:
  bin: "/usr/bin/redis-cli"
  namespace: resque:gitlab
  socket: "/var/run/redis/redis.sock"
log_level: INFO
audit_usernames: false

I see #8045 (closed) but don't know if they related at all.

Now push, pull, create repos, .. work fine, but Accept Merge Request and Web Edit do not work.

@cirosantilli do you have any idea why?

By Administrator on 2014-11-04T12:08:59 (imported from GitLab project)

Created by: cirosantilli

@favadi It does not have to be RVM: any two rubies may trigger the problem since it is a PATH change.

Now push, pull, create repos, .. work fine

pull should work regardless of this problem, but true, HTTPS should not work on that problem.

If you remove one of the rubies, do things start working? If yes, then it's likely the same problem.

By Administrator on 2014-11-04T09:24:03 (imported from GitLab project)

Created by: favadi

@cirosantilli I install ruby 2.1 from this repo: http://brightbox.com/docs/ruby/ubuntu/ (Ubuntu 12.04) and it requires ruby 1.8 (I have no idea why).

lrwxrwxrwx 1 root root   22 Oct 28 15:44 /usr/bin/ruby -> /etc/alternatives/ruby
-rwxr-xr-x 1 root root 6200 Nov 26  2013 /usr/bin/ruby1.8
-rwxr-xr-x 1 root root 6128 May 11 12:03 /usr/bin/ruby2.1

Do you think that move /usr/bin/ruby1.8 to another location will work?

By Administrator on 2014-11-04T09:36:48 (imported from GitLab project)

Created by: cirosantilli

Do you think that move /usr/bin/ruby1.8 to another location will work?

Yes, renaming the executable to ruby.bak might work as it won't be found on the path an the good ruby will be used.

By Administrator on 2014-11-04T09:42:30 (imported from GitLab project)

Created by: favadi

@cirosantilli so my problem is not related with multiple rubies versions.

[09:59:12] root@git:~ ls /usr/bin/ruby*
/usr/bin/ruby  /usr/bin/ruby2.1

Now I only have ruby2.1 installed, but the same error still happens.

Compare my error to this original thread error, I see that mine complains about /home/gitlab/repositories/favadi/test.git/Gemfile not couldn't find a specific gem. Is this make any different?

By Administrator on 2014-11-04T10:06:16 (imported from GitLab project)

Created by: cirosantilli

If you don't get missing gems, it's likely another problem since that was the root of the problem. Feel free to open another issue.

By Administrator on 2014-11-04T10:10:19 (imported from GitLab project)

Created by: favadi

I've created a separated issue #8240.

By Administrator on 2014-11-04T10:16:35 (imported from GitLab project)