GitLab

Created by: djuretic

Summary: When viewing the Files tab on a certain repository, it just keeps saying "Loading commit data...". Viewing the logs, it shows a 500 error.

Steps to reproduce

1.- Create a new repository on Gitlab, then create it via command line, commit and push to gitlab

git init test1
cd test1/
echo "Hello world" > hello.txt
git add hello.txt
git commit -m "Initial commit"
git remote add origin [GITLAB_URL]
git push -u origin master

2.- Create a second repository

cd ..
git init test2
cd test2
echo "Bye" > bye.txt
git add bye.txt
git commit -m "First commit"

3.- Merge the second repository into the first using a subtree-merge:

cd ../test1
git remote add -f test2 ../test2
git merge -s ours --no-commit test2/master 
git read-tree --prefix=dir/ -u test2/master
git commit -m "Merge"
git push

Expected behavior: On the repository, in the Files tab, it should show information on the "Last Update" and "Last commit" columns.

Observed behavior: On the repository, in the Files tab, keeps saying "Loading commit data...", "Last Update" and "Last commits" columns are empty.

Relevant logs and/or screen shots

Processing by RefsController#logs_tree as JS
  Parameters: {"_"=>"1369411865616", "project_id"=>"test/test", "id"=>"master"}
  Rendered refs/logs_tree.js.haml (0.7ms)
Completed 500 Internal Server Error in 29ms

ActionView::Template::Error (undefined method `committed_date' for nil:NilClass):
    4: 
    5:   :plain
    6:     var row = $("table.table_#{@hex_path} tr.file_#{hexdigest(file_name)}");
    7:     row.find("td.tree_time_ago").html('#{escape_javascript time_ago_in_words(commit.committed_date)} ago');
    8:     row.find("td.tree_commit").html('#{escape_javascript render("tree/tree_commit_column", commit: commit)}');
  app/views/refs/logs_tree.js.haml:7:in `block in _app_views_refs_logs_tree_js_haml__2571681388794255075_62023040'
  app/views/refs/logs_tree.js.haml:1:in `each'
  app/views/refs/logs_tree.js.haml:1:in `_app_views_refs_logs_tree_js_haml__2571681388794255075_62023040'

Output of checks

• GitLab version: 5.2.0 6654db2c
• Application check: (I've modified the init script because I needed a gitlab user instead of git user)

WARNING: Nokogiri was built against LibXML version 2.7.8, but has dynamically loaded 2.8.0
Checking Environment ...

Git configured for gitlab 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 gitlab:gitlab? ... yes
Repo base access is drwxrws---? ... yes
post-receive hook up-to-date? ... yes
post-receive hooks in repos are links: ... 
[removed, all say '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? ... WARNING: Nokogiri was built against LibXML version 2.7.8, but has dynamically loaded 2.8.0
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? ... no
  Try fixing it:
  Redownload the init script
  For more information see:
  doc/install/installation.md in section "Install Init Script"
  Please fix the error above and rerun the checks.
Projects have satellites? ... 
[removed, all said 'yes']
Redis version >= 2.0.0? ... yes
Your git bin path is "/usr/bin/git"
Git version >= 1.7.10 ? ... yes (1.7.10)

Checking GitLab ... Finished