Software Publico / Gitlab

07 Mar, 2013

1 commit

3374027e Merge branch 'master' into fixes/api, code clean up and tests fixed ... Browse File »
```
Conflicts:
	doc/api/projects.md
	spec/requests/api/projects_spec.rb
```
Sebastian Ziebell
2013-03-07 14:51:56 +0100

27 Feb, 2013

1 commit

b3d648b4 Prevent duplicate merge events Browse File »

Dmitriy Zaporozhets
2013-02-27 17:48:51 +0200

26 Feb, 2013

1 commit

d7b667fe Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into U… ... Browse File »
```
…ndev-state-machine-stage-2

Conflicts:
	app/models/merge_request.rb
```
Dmitriy Zaporozhets
2013-02-26 10:38:40 +0200

21 Feb, 2013

1 commit

4a137651 Fix merge request closed filter. Fixed one more test Browse File »

Dmitriy Zaporozhets
2013-02-21 14:11:24 +0200

20 Feb, 2013

3 commits

6d68923e human_merge_status replaced by human_merge_status_name Browse File »

Andrew8xx8
2013-02-20 17:50:29 +0400
52e0df5c class.self methods moved to scopes Browse File »

Andrew8xx8
2013-02-20 17:50:24 +0400
e2d94e07 State machine added for merge_status field Browse File »

Andrew8xx8
2013-02-20 17:49:48 +0400

19 Feb, 2013

2 commits

155703c6 Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine ... Browse File »
```
Conflicts:
	app/models/issue.rb
	app/models/merge_request.rb
```
Dmitriy Zaporozhets
2013-02-19 11:01:19 +0200
bfc359ca Fix project filter for MR on dashboard Browse File »

Dmitriy Zaporozhets
2013-02-19 09:43:41 +0200

18 Feb, 2013

4 commits

d27ed43d Hash syntax improved Browse File »

Andrew8xx8
2013-02-18 17:22:18 +0400
29f70acc Merge Request uses StateMachine now Browse File »

Andrew8xx8
2013-02-18 14:43:50 +0400
b45e9aef Merge Request uses StateMachine now Browse File »

Andrew8xx8
2013-02-18 14:43:50 +0400
8db3920c State renamed to merge_status Browse File »

Andrew8xx8
2013-02-18 14:43:49 +0400

13 Feb, 2013

1 commit

839957cf Constants in Events looks good now Browse File »

Andrew8xx8
2013-02-13 15:48:16 +0400

03 Jan, 2013

2 commits

da03a5c7 more refactoring using models/concerns Browse File »

Dmitriy Zaporozhets
2013-01-03 09:06:07 +0200
40a956eb Few more fixes after removing roles Browse File »

Dmitriy Zaporozhets
2013-01-03 00:01:08 +0200

18 Dec, 2012

1 commit

9ada6788 Split commit_id and noteable_id for Note Browse File »

Dmitriy Zaporozhets
2012-12-18 20:02:00 +0200

11 Dec, 2012

1 commit

ca936d27 Improve CI integration for merge requests Browse File »

Dmitriy Zaporozhets
2012-12-11 06:14:05 +0300

25 Nov, 2012

1 commit

b3834bc9 Remove MergeRequest#to_raw and replace it with #to_diff and #to_patch Browse File »

Riyad Preukschas
2012-11-25 00:05:47 +0100

19 Nov, 2012

1 commit

95c23b2f Annotated. schema updated Browse File »

Dmitriy Zaporozhets
2012-11-19 21:24:05 +0300

30 Oct, 2012

1 commit

e4cf99db Refactor milestones related functionality. Added seeds for Milestine and MR Browse File »

randx
2012-10-30 09:22:24 +0200

29 Oct, 2012

2 commits

f417a265 Finalize milestones for Merge Requests Browse File »

randx
2012-10-29 23:45:11 +0200
ecdf778e Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/… ... Browse File »
```
…gitlabhq into piffio-public_submission_milestones_for_mr

Conflicts:
	app/views/merge_requests/_form.html.haml
```
randx
2012-10-29 21:37:46 +0200

26 Oct, 2012

3 commits

a7d08169 Add Milestone information in Merge Requests ... Browse File »

Step 1:
* Add milestone_id in the model for merge_requests
* Make it possible to create or update a Merge Request with an attached
  Milestone detail
* Add the possibility to filter by Milestone and / or Assignee in the
  Merge Requests listing page

2012-10-26 16:12:40 +0200

8c89beb6 Change argument order for satellite actions to always start with the user Browse File »

Riyad Preukschas
2012-10-26 00:26:47 +0200
78235edd Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction Browse File »

Riyad Preukschas
2012-10-26 00:19:01 +0200

20 Oct, 2012

2 commits

d4e36640 Fix bug in MergeRequest#mark_as_unmergable Browse File »

Riyad Preukschas
2012-10-20 15:27:34 +0200
122769e3 Refactor Gitlab::Merge ... Browse File »
```
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
```
Riyad Preukschas
2012-10-20 15:25:48 +0200

12 Oct, 2012

1 commit

3b5c7b6e minor code style fixing Browse File »

Valeriy Sizov
2012-10-12 20:07:23 +0300

10 Oct, 2012

1 commit

6dc8c0ea Make MRs also count and display its commits' notes Browse File »

Riyad Preukschas
2012-10-10 01:31:36 +0200

09 Oct, 2012

2 commits

41e53eb9 Annotated Browse File »

Dmitriy Zaporozhets
2012-10-09 11:14:17 +0300
df7c5248 simple refactoring Browse File »

Andrey Kumanyaev
2012-10-09 04:10:04 +0400

27 Sep, 2012

2 commits

841e4fbd cosmetical cleanup of models Browse File »

Nihad Abbasov
2012-09-27 02:05:53 -0700
2a4359a5 annotate models Browse File »

Nihad Abbasov
2012-09-27 02:05:53 -0700

26 Sep, 2012

2 commits

afc4a754 Use Rails.root.join where appropriate Browse File »

Robert Speicher
2012-09-26 16:32:26 -0400
83efcabc set activerecord whitelist_attributes to true Browse File »

Nihad Abbasov
2012-09-26 11:18:35 -0700

11 Sep, 2012

1 commit

40eec08c Merge pull request #1409 from riyad/update-votes ... Browse File »
```
Update votes for issues and merge requests
```
Dmitriy Zaporozhets
2012-09-11 23:08:19 -0700

08 Sep, 2012

1 commit

a2a00600 Rename Upvote role to Votes Browse File »

Riyad Preukschas
2012-09-08 16:05:48 +0200

29 Aug, 2012

1 commit

ad3a88cf Prepared for gitolite v3 Browse File »

randx
2012-08-29 02:03:04 +0300

21 Aug, 2012

1 commit

9ec4c2d2 Show only the commits that are newer in the merge request. Browse File »

Sytse Sijbrandij
2012-08-21 23:07:11 +0200