Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

Gemfile

@@ -1,4 +1,4 @@
-source 'http://gems.ruby-china.org/'
+source 'https://gems.ruby-china.com/'
 
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only

app/views/issues/_form.html.erb

@@ -13,6 +13,7 @@
                   }
                   });
               <% end %>
+            <p class="none c_red ml100" id="issue_subject_notice"></p>
           <% end %>
           <span ></span>
         </li>
@@ -186,17 +187,22 @@
     }
 
     function issue_create(){
-        var issue_commit_ids = $("#issue_commit_ids .commit_id_value");
-        var str = "";
-        for(var i=0; i < issue_commit_ids.length; i++){
-            str += $(issue_commit_ids[i]).html();
-            if(i != issue_commit_ids.length -1){
-                str += ",";
+        if($("#issue_subject").val().trim() == ""){
+            $("#issue_subject_notice").html("主题不能为空").show();
+        } else {
+            $("#issue_subject_notice").hide();
+            var issue_commit_ids = $("#issue_commit_ids .commit_id_value");
+            var str = "";
+            for(var i=0; i < issue_commit_ids.length; i++){
+                str += $(issue_commit_ids[i]).html();
+                if(i != issue_commit_ids.length -1){
+                    str += ",";
+                }
             }
+            issue_desc_editor.sync();
+            $('#commit_ids').val(str);
+            $('#issue-form').submit();
         }
-        issue_desc_editor.sync();
-        $('#commit_ids').val(str);
-        $('#issue-form').submit();
     }
 
     function get_issue_commit_ids(id, project_id){

app/views/users/_homework_base_info.html.erb

@@ -15,7 +15,7 @@
         缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
       </div>
       <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=user_activity_id %>">
-        匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end.nil? ? '--' : (activity.homework_detail_manual.evaluation_end.to_s+" 00:00") %>
+        匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end.nil? ? '--' : format_time(Time.parse("#{activity.homework_detail_manual.evaluation_end}") + 1.day - 1)  %>
       </div>
   <% end %>
 </div>

lib/dalli-2.7.2/Gemfile

@@ -1,4 +1,4 @@
-source 'http://gems.ruby-china.org/'
+source 'https://gems.ruby-china.com/'
 
 gemspec
 

lib/gitlab-cli/Gemfile

@@ -1,4 +1,4 @@
-source 'http://gems.ruby-china.org/'
+source 'https://gems.ruby-china.com/'
 
 # Specify your gem's dependencies in gitlab.gemspec
 gemspec

lib/grack/Gemfile

@@ -1,4 +1,4 @@
-source 'http://gems.ruby-china.org/'
+source 'https://gems.ruby-china.com/'
 
 gemspec
 

lib/plugins/acts-as-taggable-on/Gemfile

@@ -1,4 +1,4 @@
-source 'http://gems.ruby-china.org/'
+source 'https://gems.ruby-china.com/'
 
 gemspec
 

lib/rails_kindeditor/Gemfile

@@ -1,4 +1,4 @@
-source "http://gems.ruby-china.org/"
+source "https://gems.ruby-china.com/"
 
 gemspec
 

lib/wechat/Gemfile

@@ -1,4 +1,4 @@
-source 'http://gems.ruby-china.org/'
+source 'https://gems.ruby-china.com/'
 
 gemspec
 

plugins/redmine_ckeditor/Gemfile

@@ -1,4 +1,4 @@
-source 'http://gems.ruby-china.org/'
+source 'https://gems.ruby-china.com/'
 
 gem 'rich', '1.4.6'
 gem 'kaminari'