Commit Graph
1032 Commits
Author SHA1 Message Date
Erik Weatherwax 1ff781c3c9 Fix spelling error in merge request performance issue warning. 2014-08-20 12:53:19 -04:00
Robert Schilling 2ca928d49a Fix minor spelling error 2014-08-17 19:58:57 +02:00
Dmitriy Zaporozhets 014eff5d8f Merge pull request #7499 from skv-headless/fix-commit-msg
Fix commit msg
2014-08-15 10:23:45 +03:00
Dmitriy Zaporozhets 433dac7799 Merge pull request #7465 from Razer6/better_label_color_validation
Better label color validation, fixes #7454
2014-08-15 10:17:16 +03:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
skv fe46500448 gfm and preserve commit message
for commits#show
2014-08-14 15:20:34 +04:00
skv 3d7b79e454 whitespaceses at beginning of commit messages 2014-08-14 15:19:44 +04:00
Dmitriy Zaporozhets 540596b7b5 Remove labels with ajax request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-13 19:47:03 +03:00
Robert Schilling 6085b6a765 Move label coffeescript from view to class 2014-08-13 15:48:26 +02:00
Robert Schilling 0b5e0e4c55 Disable label submit button if any field is empty 2014-08-13 15:48:26 +02:00
Dmitriy Zaporozhets e24589a165 Merge pull request #7308 from Azaret/fix_milestone_description_max_length
Fix milestones description's max length
2014-08-13 16:43:04 +03:00
Dmitriy Zaporozhets 423390a2c7 Separate accept MR settings from manual merge instructions. Remove confusing click here links
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-12 11:48:58 +03:00
Dmitriy Zaporozhets 4535db04b2 Increase import timeout from 2 to 4 minutes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-11 20:58:39 +03:00
Dmitriy Zaporozhets 9238616d6f Merge pull request #7468 from Razer6/fix_wrong_compare_message
Turn if/else branch for valid compare error message
2014-08-11 13:11:00 +03:00
Dmitriy Zaporozhets 505203e7d5 Merge pull request #7466 from Razer6/improve_markup_handling
Improve readme markup,  fixes #7455
2014-08-11 13:02:24 +03:00
Robert Schilling d7701a263f Move calls to Gitlab::MarkdownHelper to application_helper 2014-08-11 11:59:36 +02:00
Dmitriy Zaporozhets 91d6f916c7 Merge pull request #7432 from Razer6/disable_comment_btn_if_empty
Disable 'Save changes' button if input is empty, fixes #6351
2014-08-11 12:40:48 +03:00
Robert Schilling 13c17ed494 Turn if/else branch vor valid compare error message 2014-08-11 09:41:05 +02:00
Robert Schilling 99eb283101 Use readme we support to render if there are multiple readmes 2014-08-11 08:50:56 +02:00
Robert Schilling 0e3f8ea2ef Use simple_format if we don't have a proper renderer 2014-08-10 14:33:22 +02:00
Ben Bodenmiller 66f8a44fd3 make bullet punctuation consistent 2014-08-04 20:51:26 -07:00
Robert Schilling 15c682fcb0 Disable 'Save changes' button if input is empty, fixes #6351 2014-08-04 20:29:17 +02:00
Dmitriy Zaporozhets 0f4748873d Project labels tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 14:06:14 +03:00
Dmitriy Zaporozhets 3ed2fce208 Style label-branch color
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 23:04:47 +03:00
Dmitriy Zaporozhets dab9835ae1 Use label-branch css for MR branches info
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 22:58:20 +03:00
Dmitriy Zaporozhets 9c5edce138 Fix issue error message layout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 22:48:06 +03:00
Dmitriy Zaporozhets ecbb3ddf21 Correct no-labels message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 19:35:36 +03:00
Dmitriy Zaporozhets 51d2910a74 Add cancel button to labels page form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 19:22:24 +03:00
Dmitriy Zaporozhets 91c1534e59 Add pagination to labels page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 19:09:24 +03:00
Dmitriy Zaporozhets 593df8e69a Improve labels
* allow developers to manage labels
* add ability to remove label

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 15:15:39 +03:00
Dmitriy Zaporozhets 6ac26a3cb6 Label views: index, new, edit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 13:27:29 +03:00
Dmitriy Zaporozhets 2c32edb3ae Fix 500 for labels page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 22:24:03 +03:00
Dmitriy Zaporozhets b2a6f4e136 Refactor label rendering and default label set generation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 22:19:47 +03:00
Dmitriy Zaporozhets d79c0ea271 Allow set labels from Issue/MR forms
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 21:23:54 +03:00
Dmitriy Zaporozhets 6fb9badcae Replace project labels with tags to prevent name conflict with GitLab labels
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 18:23:18 +03:00
Dmitriy Zaporozhets ddaa493ef3 Improve MR building
* fix 500 error when no parent for initial commit
* fix link from diff files to wrong commit

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-28 20:54:40 +03:00
Dmitriy Zaporozhets 420ba2119b Move star button to sidebar. Add counter to forks too
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-24 22:14:12 +03:00
Ciro Santilli 1591467655 Helper instead of template. 2014-07-17 22:47:17 +02:00
Ciro Santilli 9b5c7a4d60 Add star count, view logic, more tests. 2014-07-17 22:47:16 +02:00
Ciro Santilli ecd771ccdf Move coffee to assets/project 2014-07-17 22:47:16 +02:00
Ciro Santilli 714f7201d3 Add project stars. 2014-07-17 22:47:16 +02: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 3dc347a369 Cleanup diff stats UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-15 16:05:56 +03:00
Dmitriy Zaporozhets 45623089e2 Refactor MR build process
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-15 15:34:06 +03:00
Gregoire Daussin cc6edc416e Fix milestones description's max length 2014-07-15 09:34:05 +02:00
Marin Jankovski 207bc8a0e7 Branches without parent commit cannot be merged. 2014-07-14 11:06:14 +02:00
Dmitriy Zaporozhets 1218a5e630 Add html_escape to project description. auto_link set description to html_safe but! dont escape html :(.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-11 00:07:20 +03:00
Dmitriy Zaporozhets cff1758486 Show counters in sidebar filter in same way like we did for projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-10 17:54:31 +03:00
Dmitriy Zaporozhets 53a8d50b2b Prevent html injection on commits page by commit message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-10 11:09:00 +03:00
Marin Jankovski 6b121aa5a7 Move the links decision to helper. 2014-07-09 10:12:09 +02:00