GitLab

Created by: unanao

Summary: I click "Accept merge request" from  web, the operation executed , and no effection.   I  merge the request manually successfully . 

I post a question on google gropus, we encounter the same problem. Here is the link: https://groups.google.com/forum/?fromgroups#!topic/gitlabhq/KdgiutwNyxc

Steps to reproduce:  1. creat a new branch and  push it to the the new branch
                               2. create a  "merge request"
                               3. The assigned account click "Accept merge request" from  web"   the operation executed , but no effection.
                               4.  merge the request manually successfully .  The web also display accept the merge

Expected behavior:  Should merge the branch to master.

Observed behavior:  only excute a while, no effection

Relevant logs and/or screen shots:  product.log

(Started GET "/root/testing/merge_requests/4/diffs" for at 2013-06-10 08:55:42 +0800 Processing by MergeRequestsController#diffs as / Parameters: {"project_id"=>"root/testing", "id"=>"4"} Rendered votes/_votes_block.html.haml (1.0ms) Rendered merge_requests/show/_mr_title.html.haml (4.8ms) Rendered merge_requests/show/_how_to_merge.html.haml (0.4ms) Rendered merge_requests/show/_mr_box.html.haml (2.5ms) Rendered merge_requests/show/_mr_accept.html.haml (1.9ms) Rendered commits/_commit.html.haml (4.3ms) Rendered commits/_commit.html.haml (4.4ms) Rendered commits/_commit.html.haml (4.5ms) Rendered merge_requests/show/_commits.html.haml (14.0ms) Rendered notes/_form.html.haml (2.8ms) Rendered notes/_notes_with_form.html.haml (5.3ms) Rendered commits/_diff_head.html.haml (0.3ms) Rendered commits/_diffs.html.haml (0.7ms) Rendered merge_requests/show/_diffs.html.haml (1.0ms) Rendered merge_requests/_show.html.haml (34.2ms) Rendered merge_requests/diffs.html.haml within layouts/project_resource (36.5ms) Rendered layouts/_head.html.haml (1.6ms) Rendered layouts/_search.html.haml (16.0ms) Rendered layouts/_head_panel.html.haml (20.0ms) Rendered layouts/_init_auto_complete.html.haml (6.4ms) Rendered layouts/_flash.html.haml (0.1ms) Rendered shared/_no_ssh.html.haml (1.0ms) Rendered layouts/nav/_project.html.haml (14.0ms) Completed 200 OK in 188ms (Views: 138.6ms | ActiveRecord: 6.3ms) Connecting to database specified by database.yml Creating scope :opened. Overwriting existing method Issue.opened. Creating scope :closed. Overwriting existing method MergeRequest.closed. Connecting to database specified by database.yml Creating scope :opened. Overwriting existing method Issue.opened. Creating scope :closed. Overwriting existing method MergeRequest.closed. ) githost.log ( June 10, 2013 08:55 -> ERROR -> Command failed [1]: /usr/bin/git --git-dir=/home/git/gitlab-satellites/root/testing/.git push origin master

remote: /usr/local/lib/ruby/gems/1.9.1/gems/bundler-1.3.5/lib/bundler/shared_helpers.rb:2:in require': no such file to load -- rubygems (LoadError) remote: from /usr/local/lib/ruby/gems/1.9.1/gems/bundler-1.3.5/lib/bundler/shared_helpers.rb:2 remote: from /usr/local/lib/ruby/gems/1.9.1/gems/bundler-1.3.5/lib/bundler/setup.rb:1:inrequire' remote: from /usr/local/lib/ruby/gems/1.9.1/gems/bundler-1.3.5/lib/bundler/setup.rb:1 remote: error: hook declined to update refs/heads/master To /home/git/repositories/root/testing.git ! [remote rejected] master -> master (hook declined) error: failed to push some refs to '/home/git/repositories/root/testing.git' )

Output of checks: Results of GitLab Application Check: (git@ThinkpadT430i:~/gitlabhq$ bundle exec rake gitlab:check RAILS_ENV=production Checking Environment ...

Git configured for git user? ... yes Has python2? ... yes python2 is supported version? ... yes

Checking Environment ... Finished

Checking GitLab Shell ...

GitLab Shell version >= 1.4.0 ? ... OK (1.4.0) Repo base directory exists? ... yes Repo base directory is a symlink? ... no Repo base owned by git:git? ... yes Repo base access is drwxrws---? ... yes post-receive hook up-to-date? ... yes post-receive hooks in repos are links: ... Administrator / testing ... ok unanao / testing ... ok

Checking GitLab Shell ... Finished

Checking Sidekiq ...

Running? ... yes

Checking Sidekiq ... Finished

Checking GitLab ...

Database config exists? ... yes Database is SQLite ... no All migrations up? ... yes GitLab config exists? ... yes GitLab config outdated? ... no Log directory writable? ... yes Tmp directory writable? ... yes Init script exists? ... yes Init script up-to-date? ... yes Projects have satellites? ... Administrator / testing ... yes unanao / testing ... yes Redis version >= 2.0.0? ... yes Your git bin path is "/usr/bin/git" Git version >= 1.7.10 ? ... no -----------(I can merge the request manually successfully . git must be ok ) Try fixing it: Update your git to a version >= 1.7.10 from 1.7.9 Please fix the error above and rerun the checks.

Checking GitLab ... Finished ) git@ThinkpadT430i:~/gitlabhq$ bundle exec rake gitlab:env:info RAILS_ENV=production (System information System: Ubuntu 12.04 Current User: git Using RVM: no Ruby Version: 1.9.3p392 Gem Version: 1.8.23 Bundler Version:1.3.5 Rake Version: 10.0.4

GitLab information Version: 5.2.0 Revision: 02a7b127 Directory: /home/git/gitlabhq DB Adapter: mysql2 URL: http://localhost HTTP Clone URL: http://localhost/some-project.git SSH Clone URL: git@localhost:some-project.git Using LDAP: no Using Omniauth: no

GitLab Shell Version: 1.4.0 Repositories: /home/git/repositories/ Hooks: /home/git/gitlab-shell/hooks/ Git: /usr/bin/git )