Commit graph

24 commits

Author SHA1 Message Date
Andrew Tomaka
83b5a9ae2b Update help texts and default value setting 2015-03-24 12:27:26 -04:00
Dmitriy Zaporozhets
3bfd53149c Replace bs-callout with alert 2015-03-06 18:36:22 -08:00
Vinnie Okada
9e9ce95d62 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
Dmitriy Zaporozhets
6177256033 Move labels/milestones tabs to side navigation 2015-02-19 15:46:48 -08: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
Benjamin Kammerl
7606b93c26 Change label color text field type to "color" 2015-02-11 10:02:36 +00:00
Valery Sizov
e683d9c087 Possibility to create Milestones or Labels when Issues are disabled 2014-11-20 18:18:16 +02:00
Robert Schilling
bd2355191f Show labels help message if last label is deleted 2014-09-04 23:15:28 +02: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
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
0f4748873d
Project labels tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 14:06:14 +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
32ecb02784
Refactor scss
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-20 13:51:22 +02:00
Dmitriy Zaporozhets
6c5fa569d7 Reduce usage of bold font 2013-10-21 10:32:05 +03:00
Dmitriy Zaporozhets
2a37db4c9e remove unnecessary %br and title 2013-07-17 14:53:23 +03:00
Dmitriy Zaporozhets
36fd4de825 Replace page_title with page-title. Correct margin for some blocks/layouts 2013-07-13 08:45:48 +03:00
Dmitriy Zaporozhets
2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00