Software Publico / Gitlab

13 Jun, 2014

1 commit

59e18195 Apply soft diff limits to MergeRequest#new page ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-13 15:00:35 +0300

12 Jun, 2014

1 commit

98416ec9 Show proper message for new MR when satellite fails ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-06-12 21:49:45 +0300

28 May, 2014

1 commit

a18ae13e Backport CI service refactoring from EE ... Browse File »
```
It allows easier contribution of different CI services

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-28 11:35:43 +0300

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

08 May, 2014

1 commit

8eae01ea Compare branches in MergeRequestsController#new action ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-08 15:38:52 +0300

11 Apr, 2014

1 commit

aa6426f4 Satellite will exist when doing automerge_check. Browse File »

Marin Jankovski
2014-04-11 10:22:32 +0200

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

06 Apr, 2014

1 commit

1a17289b Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/… ... Browse File »

…gitlabhq into jacob-carlborg-remove_source_branch_button

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

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb

2014-04-06 13:54:54 +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

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

26 Feb, 2014

2 commits

5d6e4bd2 Fix gitlab ci widget for forks ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-02-26 13:18:27 +0200
1ff1b6d8 Merge pull request #5719 from jacob-carlborg/mr_target ... Browse File »
```
By default, target original repository if it's a fork when creating new MR.
```
Dmitriy Zaporozhets
2014-02-26 12:33:48 +0200

25 Feb, 2014

1 commit

645e8d47 Move services for collecting items to Finders ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-02-25 19:15:08 +0200

24 Feb, 2014

1 commit

9439cb55 By default, target original repository if fork when creating new MR. Browse File »

Jacob Carlborg
2014-02-24 22:06:25 +0100

18 Feb, 2014

2 commits

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
70212889 Allow change assignee/milestone from MergeRequest show page ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-02-18 16:24:27 +0200

13 Feb, 2014

1 commit

abb31213 Show only people who have assigned merge requests in assignee dropdown ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-02-13 13:59:07 +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

23 Jan, 2014

2 commits

28e13634 Merge branch 'improve/mr_diff' ... Browse File »

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

Conflicts:
	features/steps/project/project_fork.rb
	features/steps/project/project_forked_merge_requests.rb
	features/steps/project/project_issue_tracker.rb
	features/steps/project/project_markdown_render.rb
	features/steps/shared/project.rb

2014-01-23 14:38:23 +0200

ccae561f Fix selectbox when submit MR from fork to origin ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-23 10:08:26 +0200

22 Jan, 2014

3 commits

4d56c359 Merge pull request #6075 from skv-headless/remove_deprecated_finders ... Browse File »
```
Remove deprecated finders
```
Dmitriy Zaporozhets
2014-01-22 11:04:56 -0800
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
193a5ed3 Render MR diff correctly ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-22 15:20:40 +0200

20 Jan, 2014

1 commit

e583df54 Dont override project_id params when use issues/mr filtering ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-20 14:16:12 +0200

19 Jan, 2014

1 commit

a3f645ef Remove deprecated finders Browse File »

skv
2014-01-19 23:39:56 +0400

15 Jan, 2014

2 commits

234b86c9 Use FilteringService for project issuus, mrs ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-15 16:32:44 +0200
38d8d749 Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq Browse File »

Dmitriy Zaporozhets
2014-01-15 10:36:12 +0000

14 Jan, 2014

1 commit

2940785c Add sort dropdown to merge requests list ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-14 20:55:59 +0200

13 Jan, 2014

1 commit

87814591 Use params[:merge_commit_message] in MergeRequestController for automerge ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-13 17:21:59 +0200

25 Dec, 2013

2 commits

f554aa38 Update commentable controllers with new note vars ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2013-12-25 22:32:48 +0200
f7e7dc7e Make note anchors actually work ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2013-12-25 13:32:43 +0200

20 Dec, 2013

1 commit

1231a367 Dont allow change of MR target or source projects after it was created ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2013-12-20 09:48:43 +0200

19 Dec, 2013

1 commit

f8114954 Add button for removing source branch for merged MR's. Browse File »

Jacob Carlborg
2013-12-19 14:02:54 +0100

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

02 Dec, 2013

1 commit

e3464a54 Remove .js format for MergeRequest controller ... Browse File »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2013-12-02 14:27:36 +0200

26 Sep, 2013

1 commit

052a7cc9 Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2 ... Browse File »
```
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
```
Dmitriy Zaporozhets
2013-09-26 22:19:01 +0300

07 Sep, 2013

1 commit

01ff084a Improved large commit handling. ... Browse File »

Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.

A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
resource usage with huge commits.

Related to #1745, #2259

In addition, handle large commits for MergeRequests and Compare controllers.

Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.

2013-09-07 14:44:03 +0300