Commit Graph

16 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets b05a67f4e3
Split merge request coffee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 16:22:57 +02:00
Dmitriy Zaporozhets 99a2b31e98
Dont allow merge without commit message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-14 19:56:52 +02:00
Dmitriy Zaporozhets 8a17961126
Replace chosen with select2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-11 12:11:54 +02:00
Dmitriy Zaporozhets e3464a54d8
Remove .js format for MergeRequest controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 14:27:36 +02: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 ce5fca4828 Fix MR modal 2013-08-01 15:59:57 +03:00
Dmitriy Zaporozhets 37f3d0f25b Fix newlines in how-to-merge. Added steps description. Fixes #3772 2013-05-02 13:23:50 +03:00
Dmitriy Zaporozhets 39f4604653 refactor scss, refove unused classes 2013-04-06 14:35:17 +03:00
Dmitriy Zaporozhets 585259b837 Fix merge state detection 2013-02-21 09:25:07 +02:00
Andrew8xx8 6e333d5075 Javascript widget fixed 2013-02-19 12:57:09 +04:00
Andrey Kumanyaev eb99feb4a7 simple refactoring 2013-01-24 22:31:48 +02:00
Dmitriy Zaporozhets ee43e9248c Add warning if user own projet but not in team. Also show loading when merge MR 2013-01-21 15:05:18 +02:00
Dmitriy Zaporozhets 891bc414b1 Fix merge_request js -> ci_path 2013-01-05 23:26:14 +02:00
Koen Punt a1566a9c86 Converted merge_requests.js to coffeescript and updated code 2013-01-05 02:53:34 +01:00
Dmitriy Zaporozhets faf7c79eb2 lil js refactoring 2011-12-12 20:08:04 +02:00
Dmitriy Zaporozhets 6d460aa2d6 merge request entity 2011-11-28 09:39:43 +02:00