summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorJosh Frye <joshfng@gmail.com>2016-05-26 14:49:25 +0000
committerJosh Frye <joshfng@gmail.com>2016-05-26 14:49:25 +0000
commit85495c8c85533e2d4156231fd2535270afffef5a (patch)
treeba76d51bcacce46b0a497100285a3f3a9103d2af /app/views
parent24b24aff754e3c7fd9ba8306fc3a452338872276 (diff)
parentd5e93deb012423697158576cfd1c22ed582cb23c (diff)
downloadgitlab-ce-85495c8c85533e2d4156231fd2535270afffef5a.tar.gz
Merge branch 'remove-main-language' into 'master'
Remove main_language and tests. Closes #14937 See merge request !4293
Diffstat (limited to 'app/views')
-rw-r--r--app/views/shared/projects/_project.html.haml3
1 files changed, 0 insertions, 3 deletions
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml
index 9ef021747a5..b8b66d08db8 100644
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
@@ -12,9 +12,6 @@
%li.project-row{ class: css_class }
= cache(cache_key) do
.controls
- - if project.main_language
- %span
- = project.main_language
- if project.commit.try(:status)
%span
= render_commit_status(project.commit)