fix compatibility with old events

Dmitriy Zaporozhets
1 parent a951e6f8
Showing 2 changed files with 7 additions and 1 deletions Show diff stats
app/controllers/projects_controller.rb
app/models/gitlab_serialize.rb
@@ -13,7 +13,7 @@ class ProjectsController &lt; ApplicationController
   def index
     @projects = current_user.projects
     @projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse
-    @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(40)
+    @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(20)
   end
  
   def new
 class GitlabSerialize
   # Called to deserialize data to ruby object.
   def load(data)
+    hash = parse_data(data)
+    hash = HashWithIndifferentAccess.new(hash) if hash
+    hash
+  end
+
+  def parse_data(data)
     JSON.load(data)
   rescue JSON::ParserError
     begin
...	...	@@ -13,7 +13,7 @@ class ProjectsController < ApplicationController
13	13	def index
14	14	@projects = current_user.projects
15	15	@projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse
16		- @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(40)
	16	+ @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(20)
17	17	end
18	18
19	19	def new
...	...
1	1	class GitlabSerialize
2	2	# Called to deserialize data to ruby object.
3	3	def load(data)
	4	+ hash = parse_data(data)
	5	+ hash = HashWithIndifferentAccess.new(hash) if hash
	6	+ hash
	7	+ end
	8	+
	9	+ def parse_data(data)
4	10	JSON.load(data)
5	11	rescue JSON::ParserError
6	12	begin
...	...