Software Publico / Gitlab

27 May, 2014

1 commit

affd376f Dont show remove source branch ckecbox/button if you dont have such ... Browse File »
```
permissions for MR page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-27 18:51:41 +0300

13 May, 2014

2 commits

1f1c59b6 Merge pull request #6778 from dblessing/feature/mr_labels ... Browse File »
```
Merge Request Labels
```
Dmitriy Zaporozhets
2014-05-13 14:43:46 +0300
5f25cdfe Implement Merge Request Labels Browse File »

Drew Blessing
2014-05-13 06:41:36 -0500

08 May, 2014

1 commit

23de3551 Add MergeRequest#target_project_namespace ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-08 15:37:36 +0300

09 Apr, 2014

1 commit

36f861f1 Re-annotate models ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-09 15:05:03 +0300

07 Apr, 2014

1 commit

d92e4830 Allow people to remove source branch of fork project in MR ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-07 19:11:02 +0300

03 Apr, 2014

1 commit

9b598fa6 Fix MR fork validation and services load ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-03 10:36:10 +0300

02 Apr, 2014

1 commit

9ee697dd Use MergeRequest services in API and controllers ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-02 21:51:53 +0300

25 Mar, 2014

1 commit

f08464c0 Remove author_id_of_changes from app ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-25 14:01:52 +0200

12 Mar, 2014

1 commit

55fbe71a Fix error with reopened merge request not properly reloading ... Browse File »

If you reopen a Merge Request and then try to update the source branch
it won't properly reload the code since the "reload_code" method still
checks if the MR is "opened" and not just "open" (which includes reopened)

2014-03-12 08:54:42 +0200

28 Feb, 2014

1 commit

36b065e6 Feature: reopen closed merge request ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-02-28 22:43:16 +0200

18 Feb, 2014

1 commit

1c61ac1c Refactor MR code reload ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-02-18 20:17:26 +0200

15 Feb, 2014

1 commit

1e106756 For form MR render only namespace name ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-02-15 14:36:58 +0200

31 Jan, 2014

1 commit

f416b2f5 Fix bug with merge request branch select ... Browse File »

Merge request target branch select is broken if you submit form and have
some errors on page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2014-01-31 13:24:38 +0200

24 Jan, 2014

2 commits

1338c7dd Fix mr update issue if merge_request_diff missing ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-24 14:38:02 +0200
48f741ee MergeRequests services ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-24 14:18:32 +0200

23 Jan, 2014

1 commit

38034278 Fix MR spinach tests ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-23 12:55:43 +0200

22 Jan, 2014

3 commits

4b3afe23 Always create merge_request_diff if MR created ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-22 20:22:20 +0200
51ea42e2 Improve commit render performnace for MR show page ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-22 15:54:53 +0200
79bfbe59 Remove commits/diff store login from MergeRequest model ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-22 15:20:20 +0200

14 Jan, 2014

1 commit

09d5868c Fix mr controller specs ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-14 10:47:28 +0200

13 Jan, 2014

1 commit

db966364 MergeRequest#automerge accepts custom message now. MergeRequest#merge_commit_mes… ... Browse File »
```
…sage generate default one

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-13 17:20:30 +0200

13 Dec, 2013

1 commit

63723ef6 Fix dashboard event caching Browse File »

Drew Blessing
2013-12-13 13:40:45 -0600

12 Dec, 2013

2 commits

cb599a09 Allow close of broken MR ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2013-12-12 12:20:54 +0200
6c345997 Add new methods to MR to check if source or target branch exists ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2013-12-12 11:34:42 +0200

07 Oct, 2013

1 commit

b658489f Fix bugs when discussion visible in wrong project ... Browse File »

Because notes scope was not limited by project in
MergeRequest#mr_and_commit_notes it causes comments from project A
appears in discussions for MR in project B.

2013-10-07 14:49:01 +0300

01 Oct, 2013

1 commit

e219cf72 Annotate! Browse File »

Dmitriy Zaporozhets
2013-10-01 15:15:28 +0300

09 Sep, 2013

1 commit

76a07394 Add description to MergeRequest model Browse File »

Dmitriy Zaporozhets
2013-09-09 16:32:43 +0300

25 Aug, 2013

1 commit

c8a115c0 Link issues from comments and automatically close them ... Browse File »

Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.

2013-08-25 18:58:41 -0400

21 Aug, 2013

2 commits

8dd37afe Reannotate Browse File »

Dmitriy Zaporozhets
2013-08-21 12:34:02 +0300
625fb2f2 Add iids to milestones. Moved iids logic to separate concern Browse File »

Dmitriy Zaporozhets
2013-08-21 12:16:26 +0300

19 Aug, 2013

1 commit

7047a44a Sett iid on create. Use iid as value to_param Browse File »

Dmitriy Zaporozhets
2013-08-19 22:10:56 +0300

08 Aug, 2013

3 commits

7fefb039 Fix filter context. Dont duplicate target project name for MR Browse File »

Dmitriy Zaporozhets
2013-08-08 17:29:31 +0300
f4978bc0 Fix unmerged diff for non-fork MR Browse File »

Dmitriy Zaporozhets
2013-08-08 12:44:33 +0300

4537623d Merge branch 'master' into karlhungus-mr-on-fork ... Browse File »

Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb

2013-08-08 12:22:09 +0300

05 Aug, 2013

1 commit

b9265566 Update main calls to gitlab_git Browse File »

Dmitriy Zaporozhets
2013-08-05 16:51:04 +0300

17 Jul, 2013

4 commits

d9959427 Style changes from review with @randx ... Browse File »

-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow

Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150

2013-07-17 22:48:03 -0400

0ef055a4 MR on fork: Email fixes, style fixes ... Browse File »

-Removed many extra spaces I added
-Fixed email templates to be consistent/better looking

GITLAB-894, GITLAB-895, (GITLAB-858)

Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e

2013-07-17 22:46:38 -0400

09112dbb Rebase on master ... Browse File »
```
Trying to retrigger travis
Change-Id: Ifd86fb4c6b2791ad176230254fbf69a9ade979fb
```
Izaak Alpert
2013-07-17 22:45:03 -0400

5d56da6b MR on fork: Some cleanup, test updates ... Browse File »

-The forked merge request test now tests it's componenets again, and seems to work every time (did this by reordering the branch updates so their is more time for update_branches to run) -- this could still technically fail, but after several runs it doesn't seem to.
-Removed todo in merge_request, pushed wrapping of grit down to the satellite
-updated action test to check flock status, made it nolonger pending
-moved all logging on failure to helper method in satellite
GITLAB-592

Change-Id: If0554ca35eedc3d3e8461f7d93d4b3939fa2cd75

2013-07-17 22:42:51 -0400