GitLab 5.2: Edit File does not commit changes -- Your changes could not be commited, because the file has been changed
Created by: sroth80021
In our 5.2 repository, the file edit functionality does not work -- when we click the Commit button, we get the message:
Your changes could not be commited, because the file has been changed
Unfortunately, no error is logged in any of the GitLab logfiles.
Repro steps: 1- commit text file to repo, push to GitLab 2- click on repo, click on Files, click on the txt File, click edit button 3- make change, enter commit message, click Commit
In the header, you briefly see the message: Your changes could not be commited, because the file has been changed
The page refreshes (still in edit mode), and your change disappears. The change was not pushed to the repository.
None of the GitLab logfiles indicate any errors. The production logfile is updated, but does not show any errors. The other logfiles are not updated.
production logfile has:
Started PUT "/some_repo/edit/master/README" for 127.0.0.1 at 2013-06-06 07:37:43 -0700
Processing by EditTreeController#update as HTML
Parameters: {"utf8"=>"✓", "authenticity_token"=>"5xWP6CrrML7HzMFyDlJkir4nEK3UWJdjDZ/HR2H80n0=", "commit_message"=>"Update README", "last_commit"=>"21890c76a7ca1d6897b2a398967425970af1a0c1", "content"=>"Some text\r\n", "project_id"=>"some_repo", "id"=>"master/README"}
Rendered edit_tree/show.html.haml within layouts/project_resource (3.4ms)
Rendered layouts/_head.html.haml (1.2ms)
Rendered layouts/_search.html.haml (19.0ms)
Rendered layouts/_head_panel.html.haml (22.9ms)
Rendered layouts/_init_auto_complete.html.haml (5.2ms)
Rendered layouts/_flash.html.haml (0.1ms)
Rendered shared/_no_ssh.html.haml (0.9ms)
Rendered layouts/nav/_project.html.haml (14.9ms)
Completed 200 OK in 148ms (Views: 51.5ms | ActiveRecord: 4.4ms)
Started GET "/assets/logo-white.png" for 127.0.0.1 at 2013-06-06 07:37:44 -0700
Served asset /logo-white.png - 304 Not Modified (0ms)
Started GET "/assets/icon-search.png" for 127.0.0.1 at 2013-06-06 07:37:44 -0700
Served asset /icon-search.png - 304 Not Modified (0ms)Activity
Created by: sroth80021
Hmm, I do see this in the githost.log file exposed via GitLab:
June 06, 2013 07:33 -> ERROR -> Command failed [1]: /usr/bin/git --git-dir=/scratch/git/gitlab-satellites/some_repo/.git push origin master remote: /scratch/git/gems/gems/bundler-1.3.5/lib/bundler/shared_helpers.rb:2:in `require': no such file to load -- rubygems (LoadError)[K remote: from /scratch/git/gems/gems/bundler-1.3.5/lib/bundler/shared_helpers.rb:2[K remote: from /scratch/git/gems/gems/bundler-1.3.5/lib/bundler/setup.rb:1:in `require'[K remote: from /scratch/git/gems/gems/bundler-1.3.5/lib/bundler/setup.rb:1[K remote: error: hook declined to update refs/heads/master[K To /scratch/git/repositories/some_repo.git ! [remote rejected] master -> master (hook declined) error: failed to push some refs to '/scratch/git/repositories/some_repo.git' June 06, 2013 07:37 -> ERROR -> Command failed [1]: /usr/bin/git --git-dir=/scratch/git/gitlab-satellites/some_repo/.git commit -a -m Update README warning: CRLF will be replaced by LF in README. The file will have its original line endings in your working directory.By Administrator on 2013-06-06T14:52:30 (imported from GitLab project)
By Administrator on 2013-06-06T14:52:30 (imported from GitLab)
Created by: sroth80021
Not sure if this was required or not, but I have created a 'gitlab' account in GitLab, registered the SSH key, and added the user to the repo project, so I dont think that's an issue.
By Administrator on 2013-06-06T15:09:57 (imported from GitLab project)
By Administrator on 2013-06-06T15:09:57 (imported from GitLab)
Created by: sroth80021
Also reported in issue #4064 (closed)
By Administrator on 2013-06-06T15:11:53 (imported from GitLab project)
By Administrator on 2013-06-06T15:11:53 (imported from GitLab)
Created by: sroth80021
GitLab 5.2.
I removed and rebuilt the satellites, but I still see the issue. However, the githost.log file is now slightly cleaner:
June 06, 2013 09:46 -> ERROR -> Command failed [1]: /usr/bin/git --git-dir=/scratch/git/gitlab-satellites/some_repo/.git push origin master remote: /scratch/git/gems/gems/bundler-1.3.5/lib/bundler/shared_helpers.rb:2:in `require': no such file to load -- rubygems (LoadError)^[[K remote: from /scratch/git/gems/gems/bundler-1.3.5/lib/bundler/shared_helpers.rb:2^[[K remote: from /scratch/git/gems/gems/bundler-1.3.5/lib/bundler/setup.rb:1:in `require'^[[K remote: from /scratch/git/gems/gems/bundler-1.3.5/lib/bundler/setup.rb:1^[[K remote: error: hook declined to update refs/heads/master^[[K To /scratch/git/repositories/some_repo.git ! [remote rejected] master -> master (hook declined) error: failed to push some refs to '/scratch/git/repositories/some_repo.git'By Administrator on 2013-06-06T16:47:39 (imported from GitLab project)
By Administrator on 2013-06-06T16:47:39 (imported from GitLab)
Created by: sroth80021
RESOLVED. I have a custom update hook (which does other stuff, then calls the gitlab update hook) and my update hook did not set GEM_HOME or PATH properly. Note I am using a custom ruby install in /home/git/ruby.
Once I added these lines to the update hook, it works properly. export GEM_HOME=/home/git/gems export PATH=/home/git/ruby/bin:
PATHIf you have a custom post-receive hook, you probably want to do the same.
Also, in case anyone runs into this, I had similar error reported in githost.log when accepting a mergeReq. Both issues were solved by adding the lines above.
By Administrator on 2013-06-06T18:53:53 (imported from GitLab project)
By Administrator on 2013-06-06T18:53:53 (imported from GitLab)
Created by: mehkanik
I'm also having this issue on GitLab 6.1 after a fresh install.
No information of use in any of the logs. I've tried rebuilding my satellites as it seemed to fix the user in #1800 (closed) 's problem. I also tried adding the paths and home, which didn't work either. I keep getting the error of "Your changes could not be committed, because the file has changed".
Any information on why this is happening or how I can provide more information to help solve it?
By Administrator on 2013-10-14T02:20:02 (imported from GitLab project)
By Administrator on 2013-10-14T02:20:02 (imported from GitLab)
Created by: matthewandrews
This looks relevant: http://dev.mensfeld.pl/2013/08/gitlab-your-changes-could-not-be-commited-because-the-file-has-been-changed/
By Administrator on 2013-11-21T04:34:45 (imported from GitLab project)
By Administrator on 2013-11-21T04:34:45 (imported from GitLab)
Created by: TomyLobo
For the benefit of anyone reading the @matthewandrews' comment after the linked blog post has vanished, the command suggested was
sudo -u git -H bundle exec rake gitlab:satellites:create RAILS_ENV=productionThis will only create satellites that don't already exist, so don't forget to remove the satellite in question before recreating it.
By Administrator on 2014-06-12T16:55:12 (imported from GitLab project)
By Administrator on 2014-06-12T16:55:12 (imported from GitLab)
Created by: adurrive
Same issue with 6-9-stable:
June 13, 2014 21:03 -> ERROR -> Command failed [1]: /usr/bin/git --git-dir=/home/git/gitlab-satellites/xxxx/yyyy/.git push origin zzzz remote: /usr/local/lib/ruby/gems/2.1.0/gems/bundler-1.6.2/lib/bundler/shared_helpers.rb:2:in `require': no such file to load -- rubygems (LoadError) remote: from /usr/local/lib/ruby/gems/2.1.0/gems/bundler-1.6.2/lib/bundler/shared_helpers.rb:2 remote: from /usr/local/lib/ruby/gems/2.1.0/gems/bundler-1.6.2/lib/bundler/setup.rb:1:in `require' remote: from /usr/local/lib/ruby/gems/2.1.0/gems/bundler-1.6.2/lib/bundler/setup.rb:1 remote: error: hook declined to update refs/heads/zzzz To /home/git/repositories/xxxx/yyyy.git ! [remote rejected] zzzz -> zzzz (hook declined) error: failed to push some refs to '/home/git/repositories/xxxx/yyyy.git'The above fixes didn't work for me. Looks like there is a mixup somewhere between different versions of ruby on my system (the default one, required on some linux packages, and the newer one used by gitlab):
# which ruby /usr/bin/ruby /usr/local/bin/ruby # /usr/bin/ruby -v ruby 1.8.7 (2012-02-08 patchlevel 358) [i486-linux] # /usr/local/bin/ruby -v ruby 2.1.2p95 (2014-05-08 revision 45877) [i686-linux]Couldn't figure out where exactly it goes wrong, but either removing ruby1.8 entirely or registering the right version with the command below did the trick for me (improved with @TomyLobo's advice):
# sudo update-alternatives --install /usr/bin/ruby ruby /usr/local/bin/ruby 100I took priority 100 to be above 50 (the default priority of ruby1.8) and it worked immediately. Otherwise, you may have to check what's going on:
# sudo update-alternatives --config rubyBy Administrator on 2014-06-13T21:43:09 (imported from GitLab project)
By Administrator on 2014-06-13T21:43:09 (imported from GitLab)
Created by: TomyLobo
you could register your /usr/local/bin/ruby with the alternatives system if you want to do it a bit cleaner (and less likely to break on package updates) This looks like it might work: http://stackoverflow.com/questions/6965277/how-to-set-ruby1-9-1-as-default-version-on-debian-squeeze
By Administrator on 2014-06-13T20:06:23 (imported from GitLab project)
By Administrator on 2014-06-13T20:06:23 (imported from GitLab)
