home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,876 Commits 48 Branches 340 Tags
eea8a6d0620e47fb4c009eefb73fa100fa2ba3e8
Commit Graph
22 Commits
Author SHA1 Message Date
Dmitriy ZaporozhetsandRobert Speicher 44d35a8225 Merge branch 'merge-request-deleted-file' into 'master' 
Correctly find last known blob for file deleted in MR.

Fixes #3092.

When building a new MR, `@merge_request.commits.last` would fail because this delegates to `merge_request_diff` which is still `nil` at that point. I fixed that, and changed some of the logic because showing deleted blob contents didn't previously work for the Compare page, and the UI would show the wrong commit sha for "View File @...".

See merge request !1647
 2015-10-20 18:28:15 +02:00
Stan Hu de8497ca56 Fix Error 500 when comparing non-existing branches 
Closes #2593
 2015-09-18 12:02:01 -07:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets 26f5d6047d Refactor compare and fetch logic 2015-07-15 17:28:09 +02:00
Douwe Maan 8f75ab21d0 Link Commits tab to current branch from Compare page. 2015-05-09 22:25:52 +02:00
Stan Hu ee92dd1683 Unescape branch names in compare commit 
Closes #1399
Closes https://github.com/gitlabhq/gitlabhq/issues/9105
 2015-04-30 12:44:46 -07:00
Jeroen van Baarsen 5a4ebfb47a Fixed the Rails/ActionFilter cop 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-04-20 15:39:37 +02:00
Vinnie Okada 2a9eed6620 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/projects/commits/_commit.html.haml
	app/views/projects/issues/_issue.html.haml
	app/views/projects/issues/_issue_context.html.haml
	app/views/projects/merge_requests/_merge_request.html.haml
	app/views/projects/merge_requests/show/_context.html.haml
 2015-02-21 12:55:28 -07:00
Douwe Maan 00408f37e3 Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404. 2015-02-20 17:20:03 +01:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9 
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
 2015-02-14 11:09:23 -07:00
Valery Sizov 6f34d40436 remove auth duplication 2014-11-05 11:04:08 +02:00
Ciro Santilli 4d0d5e79ba Factor authorize_push! and authorize_code_access! 
with existing method_missing. Pattern already used extensively,
so let's be consistent and use it everywhere.
 2014-10-13 21:31:49 +02:00
Dmitriy Zaporozhets 549655765a Fix variable order on compare page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 12:42:01 +03:00
Dmitriy Zaporozhets 378a3f5ca1 Use CompareService for compare page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 12:33:51 +03:00
Dmitriy Zaporozhets be5b6db883 Refactor diff suppress logic and diff views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 18:28:21 +03:00
Dmitriy Zaporozhets 0bcabdaf83 Use gitlab_git 5.4.0 without BROKEN_DIFF constant 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-12 12:54:49 +02:00
Dmitriy Zaporozhets a1a01254b9 Prevent 500 error on Compare page if diff read timout happens 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 16:21:41 +02:00
Dmitriy Zaporozhets 8f88cbf06b Use MergeRequestDiff::COMMITS_SAFE_SIZE for Compare diff limit. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 16:09:13 +02:00
Dmitriy Zaporozhets 9c629a1ebc Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare 2013-09-16 13:33:34 +03:00
Boyan Tabakov 01ff084a4d Improved large commit handling. 
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 +03:00
Dmitriy Zaporozhets 2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00