diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-02-19 20:53:05 -0700 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-02-19 20:53:05 -0700 |
| commit | 9e9ce95d62ec4feb76c3ec238dd3189c781f40ce (patch) | |
| tree | 28939e566ce29a278cd7ae15e37266aa6a16a17c /app/views/explore | |
| parent | 76aad9b76ed756ca9ba2cbcdb399c815e542b3ae (diff) | |
| parent | de040ffaaef4ad5ebd93b3f7a237add438dbddd5 (diff) | |
| download | gitlab-ce-9e9ce95d62ec4feb76c3ec238dd3189c781f40ce.tar.gz | |
Merge branch 'master' into rails-4.1.9
Conflicts:
app/views/dashboard/_project.html.haml
app/views/events/event/_common.html.haml
app/views/explore/projects/_project.html.haml
app/views/groups/_projects.html.haml
app/views/projects/_home_panel.html.haml
app/views/projects/_issues_nav.html.haml
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/show.html.haml
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_show.html.haml
app/views/projects/milestones/index.html.haml
app/views/projects/notes/_edit_form.html.haml
app/views/shared/_issuable_filter.html.haml
Diffstat (limited to 'app/views/explore')
| -rw-r--r-- | app/views/explore/projects/_project.html.haml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/views/explore/projects/_project.html.haml b/app/views/explore/projects/_project.html.haml index cdd6ede36a1..d65fb529373 100644 --- a/app/views/explore/projects/_project.html.haml +++ b/app/views/explore/projects/_project.html.haml @@ -3,11 +3,9 @@ .project-access-icon = visibility_level_icon(project.visibility_level) = link_to project.name_with_namespace, [project.namespace.becomes(Namespace), project] - - - if current_page?(starred_explore_projects_path) - %strong.pull-right - %i.fa.fa-star - = pluralize project.star_count, 'star' + %span.pull-right + %i.fa.fa-star + = project.star_count .project-info - if project.description.present? |