3 files changed, 6 insertions, 7 deletions
diff --git a/lib/api.rb b/lib/api.rb
index d9dce7c70cc..da31a1519dd 100644
--- a/lib/api.rb
+++ b/lib/api.rb
@@ -9,7 +9,6 @@ module Gitlab
     end
 
     format :json
-    error_format :json
     helpers APIHelpers
     
     mount Groups
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 631ed535459..c4d9cd96960 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -292,7 +292,7 @@ module Gitlab
         authorize! :download_code, user_project
 
         page = params[:page] || 0
-        per_page = params[:per_page] || 20
+        per_page = (params[:per_page] || 20).to_i
         ref = params[:ref_name] || user_project.try(:default_branch) || 'master'
 
         commits = user_project.repository.commits(ref, nil, per_page, page * per_page)
diff --git a/lib/tasks/sidekiq.rake b/lib/tasks/sidekiq.rake
index cf99951e027..d0e9dfe46a1 100644
--- a/lib/tasks/sidekiq.rake
+++ b/lib/tasks/sidekiq.rake
@@ -1,19 +1,19 @@
 namespace :sidekiq do
   desc "GITLAB | Stop sidekiq"
   task :stop do
-    run "bundle exec sidekiqctl stop #{pidfile}"
+    system "bundle exec sidekiqctl stop #{pidfile}"
   end
 
   desc "GITLAB | Start sidekiq"
   task :start do
-    run "nohup bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1 &"
+    system "nohup bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1 &"
   end
-  
+
   desc "GITLAB | Start sidekiq with launchd on Mac OS X"
   task :launchd do
-    run "bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1"
+    system "bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1"
   end
-  
+
   def pidfile
     Rails.root.join("tmp", "pids", "sidekiq.pid")
   end