diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-05-21 23:17:41 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-05-21 23:17:41 +0300 |
| commit | 1b2068eaa91e5002d01a220c65da21dad8ccb071 (patch) | |
| tree | fcfeafc2d1ad23aa3b5ae4e8d19b76c3cd2efcdc /app | |
| parent | 09831488c9be082f424c774e8eecd3f002dbae37 (diff) | |
| download | gitlab-ce-1b2068eaa91e5002d01a220c65da21dad8ccb071.tar.gz | |
Gem updates & githost logger
* Grit gem updated
* gitolite-client updated
* logger added
* few fixes
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/commits_controller.rb | 1 | ||||
| -rw-r--r-- | app/helpers/application_helper.rb | 1 | ||||
| -rw-r--r-- | app/models/commit.rb | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb index 9a97e5c6282..8a91c28480c 100644 --- a/app/controllers/commits_controller.rb +++ b/app/controllers/commits_controller.rb @@ -15,6 +15,7 @@ class CommitsController < ApplicationController def index @repo = project.repo @limit, @offset = (params[:limit] || 40), (params[:offset] || 0) + @commits = @project.commits(@ref, params[:path], @limit, @offset) respond_to do |format| diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 587e6e7da5a..7cbc6c4f41c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2,6 +2,7 @@ require 'digest/md5' module ApplicationHelper def gravatar_icon(user_email = '', size = 40) + return unless user_email gravatar_host = request.ssl? ? "https://secure.gravatar.com" : "http://www.gravatar.com" user_email.strip! "#{gravatar_host}/avatar/#{Digest::MD5.hexdigest(user_email.downcase)}?s=#{size}&d=identicon" diff --git a/app/models/commit.rb b/app/models/commit.rb index 574f69bc213..ad6d7127e76 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -73,7 +73,7 @@ class Commit repo.commits(ref, limit, offset) else repo.commits(ref) - end.map{ |c| Commit.new(c) } + end.map{ |c| Commit.new(c) } end def commits_between(repo, from, to) |