From 3c5954b8c8cd9fcda374fd58bc1b079954b488b7 Mon Sep 17 00:00:00 2001 From: Nihad Abbasov Date: Wed, 27 Feb 2013 06:47:04 -0800 Subject: [PATCH 1/3] proper fix for #2300 --- lib/api/projects.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 10404b0d..c4d9cd96 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].to_i || 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) From b3d648b4e882c41e0bb7bd72dc8815f6a7321fc4 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 27 Feb 2013 17:48:51 +0200 Subject: [PATCH 2/3] Prevent duplicate merge events --- app/models/merge_request.rb | 9 +-------- app/observers/activity_observer.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 12a6dd2d..c26d40c5 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -177,15 +177,8 @@ class MergeRequest < ActiveRecord::Base end def merge!(user_id) + self.author_id_of_changes = user_id self.merge - - Event.create( - project: self.project, - action: Event::MERGED, - target_id: self.id, - target_type: "MergeRequest", - author_id: user_id - ) end def automerge!(current_user) diff --git a/app/observers/activity_observer.rb b/app/observers/activity_observer.rb index 919a50f0..152e4977 100644 --- a/app/observers/activity_observer.rb +++ b/app/observers/activity_observer.rb @@ -39,4 +39,18 @@ class ActivityObserver < ActiveRecord::Observer author_id: record.author_id_of_changes ) end + + def after_merge(record, transition) + # Since MR can be merged via sidekiq + # to prevent event duplication do this check + return true if record.merge_event + + Event.create( + project: record.project, + target_id: record.id, + target_type: record.class.name, + action: Event::MERGED, + author_id: record.author_id_of_changes + ) + end end From 33cd1ae9dce7d8a798ca312a27eb0b4872892f05 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 27 Feb 2013 18:09:48 +0200 Subject: [PATCH 3/3] Update README --- README.md | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index ee029f9b..e910dc95 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,21 @@ -# Welcome to GitLab [![build status](https://secure.travis-ci.org/gitlabhq/gitlabhq.png)](https://travis-ci.org/gitlabhq/gitlabhq) [![build status](https://secure.travis-ci.org/gitlabhq/grit.png)](https://travis-ci.org/gitlabhq/grit) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/gitlabhq/gitlabhq) [![Dependency Status](https://gemnasium.com/gitlabhq/gitlabhq.png)](https://gemnasium.com/gitlabhq/gitlabhq) +# Welcome to GitLab! Self hosted Git management software + + +## Badges: + +* master: travis-ci.org [![build status](https://secure.travis-ci.org/gitlabhq/gitlabhq.png)](https://travis-ci.org/gitlabhq/gitlabhq)a +* master: ci.gitlab.org [![CI](http://ci.gitlab.org/projects/1/status?ref=master)](http://ci.gitlab.org/projects/1?ref=master) +* [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/gitlabhq/gitlabhq) +* [![Dependency Status](https://gemnasium.com/gitlabhq/gitlabhq.png)](https://gemnasium.com/gitlabhq/gitlabhq) GitLab is a free project and repository management application -[![CI](http://ci.gitlab.org/projects/1/status?ref=master)](http://ci.gitlab.org/projects/1?ref=master) ## Application details -* based on Ruby on Rails +* powered by Ruby on Rails +* its completely free and open source * distributed under the MIT License -* works with gitolite ## Requirements @@ -16,27 +23,16 @@ GitLab is a free project and repository management application * ruby 1.9.3+ * MySQL * git -* gitolite +* gitlab-shell * redis ## Install -Checkout wiki pages for installation information, migration, etc. +Checkout [wiki](https://github.com/gitlabhq/gitlabhq/wiki) pages for installation information, migration, etc. -## Community +## [Community](http://gitlab.org/community/) -[Google Group](https://groups.google.com/group/gitlabhq) - -## Contacts - -Twitter: - - * @gitlabhq - * @dzaporozhets - -Email - - * m@gitlabhq.com +## [Contact](http://gitlab.org/contact/) ## Contribute