Merge branch 'educoder' into dev_aliyun

app/views/layouts/_logined_header.html.erb

@@ -139,21 +139,6 @@ display: none; right:110px;">
         <% end %>
         <% end %>
 
-        var begin_time = new Date();
-        var end_time = new Date("2019-10-10");
-        if (begin_time < end_time) {
-            if (window.localStorage) {
-                var uid = localStorage.getItem('competition_uid');
-            } else {
-                var uid = false
-            }
-            if (!uid) {
-                var htmlvalue = "<%= escape_javascript(render :partial => 'competitions/competitions_name')%>";
-                pop_box_new(htmlvalue, 500, 380);
-            }
-        }
-
-
         <% notice = SystemUpdateNotice.last %>
         <% if @noticed_update || ((User.current.certification == 1 || params[:controller] != "welcome") && notice.present? && notice.end_time > Time.now && notice.start_time >= (Time.now - 21600) && User.current.user_system_notices.where(:notice_type => notice.notice_type).count == 0) %>
         var htmlvalue = "<%= escape_javascript(render :partial => 'account/user_update_notice', :locals => {:notice => notice})%>";

app/views/layouts/_unlogin_header.html.erb

@@ -99,16 +99,4 @@
         document.getElementById('nHeader').style.left=sl+'px';
     };
 
-    $(function() {
-        if (window.localStorage) {
-            var uid = localStorage.getItem('competition_uid');
-        } else {
-            var uid = false
-        }
-        if(!uid){
-            var htmlvalue = "<%= escape_javascript(render :partial => 'competitions/competitions_name')%>";
-            pop_box_new(htmlvalue, 500, 380);
-        }
-    })
-
 </script>

app/views/versions/show.html.erb

@@ -71,7 +71,7 @@
               <td>#<%= issue.id %></td>
               <td><a href="<%= issue_path(issue) %>" class="new_roadmap_info_title color-grey3" title="<%= issue.subject %>" target="_blank"><%= issue.subject %></a> </td>
               <td> <%= issue.tracker %> </td>
-              <td><a href="<%= issue.assigned_to_id.nil? ? "" : user_path(issue.assigned_to) %>" class="new_roadmap_info_name" target="_blank">
+              <td><a href="<%= issue.assigned_to_id.nil? ? "" : user_path(issue.assigned_to) %>" style="max-width: 200px" title="<%= User.find(issue.try(:assigned_to_id)).nil? ? "" : User.find(issue.try(:assigned_to_id)).show_name %>" class="new_roadmap_info_name" target="_blank">
                 <%= User.find(issue.try(:assigned_to_id)).nil? ? "" : User.find(issue.try(:assigned_to_id)).show_name %></a>
               </td>
               <td><%= format_time issue.updated_on %></td>