Merge branch 'standalone_develop' into pre_trustie_server

app/controllers/concerns/repository/languages_percentagable.rb

@@ -11,7 +11,7 @@ module Repository::LanguagesPercentagable
   end
 
   def update_project_language(language)
-    return if @project.language.present?
+    return if @project.project_language.present?
     db_language = ProjectLanguage.find_or_create_by!(name: language.keys.first.downcase.upcase_first)
     @project.update_column(:project_language_id, db_language.id)
   rescue