Commit Graph
3182 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 5e7f5ee8b8 Restyle explore projects to fix #7548 2014-08-20 02:38:52 +02: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
Dmitriy Zaporozhets d8b769ec74 Make default sing-in logo smaller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-13 19:36:00 +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 d3067379a4 Fix project search showing always no results if no merge requests matches
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-11 12:48:00 +03:00
Dmitriy Zaporozhets bdb9340e4d Merge pull request #7385 from Razer6/fix_search_empty_project
Fix 500 on searching on empty project, restyle search page
2014-08-11 12:41:58 +03: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 f361be9eca Restyle search page
Use ruby 1.9 syntax
2014-08-11 11:34:45 +02:00
Robert Schilling da7e14c864 fix searching on empty project, prevent 500
Fix hound
2014-08-11 11:31:37 +02: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 2ecc79507a Order labels by name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 19:13:35 +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 86f1f8335f Merge branch 'epic/refactor-labels' into 'master'
Epic/refactor labels

Part of #1385

See merge request !1003
2014-07-30 15:02:49 +00: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 014e6d0f87 Require current password even if password was expired
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 15:28:20 +03:00
Dmitriy Zaporozhets f844556531 Fix email on push
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 15:18:11 +03:00
Dmitriy Zaporozhets f65e967780 Merge branch 'fix-mr-500-error' into 'master'
Fix MergeRequest#new page

* fix 500 error when no parent for initial commit
* fix link from diff files to wrong commit
* fix new file being skipped from diff if it was added in next commit

Fixes #1462

See merge request !998
2014-07-28 19:27:22 +00: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 746b7e2da8 Merge branch 'only_redirect_to_referer_from_public' into 'master'
Only redirect to referrer from public GitLab pages

See merge request !995
2014-07-28 16:37:04 +00:00
Jacob Vosmaer 3a6f9c093e Only redirect to referrer from public GitLab pages 2014-07-28 16:41:37 +02:00
Dmitriy Zaporozhets d3ea53877d Tests for trending/starred pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-26 10:33:42 +03:00