Commit Graph
11073 Commits
Author SHA1 Message Date
Jacob Vosmaer 08ff7c38e9 Merge pull request #7536 from yuters/patch-5
Fix color toggle for labels in edit view
2014-08-20 14:03:25 +02:00
Jacob Vosmaer ed9e922dd0 Bump version to 7.2.0.rc2 v7.2.0.rc2 2014-08-19 18:25:28 +02:00
Jacob Vosmaer 86491e6574 Merge branch 'fix_label_migration' into 'master'
Fix label migration

Failure to create any labels at all caused this DB migration to run for over 40
minutes during a gitlab.com deploy this morning. This change specifies a color f
or each new label and strips invalid characters from the label name.

See merge request !1024
2014-08-19 16:19:46 +00:00
Jacob Vosmaer dfc5bf6bf7 Use the default color when migrating labels 2014-08-19 17:43:17 +02:00
Jacob Vosmaer e354e548b9 Remove invalid characters from the label name 2014-08-19 17:42:55 +02:00
Jacob Vosmaer 7e0a2b3b3d Test if the label is valid before creating link 2014-08-19 17:42:34 +02:00
Jacob Vosmaer 0b3ebb6440 Add 6.0-to-7.2.md guide ahead of 7.2 release 2014-08-19 14:24:47 +02:00
Jacob Vosmaer af6842a97d Add 7.1-to-7.2.md update guide 2014-08-19 14:13:16 +02:00
Jeroen van Baarsen e5e3fcaf79 Merge pull request #7438 from bbodenmiller/patch-5
Add dealing with newlines for editor to 5.1-to-6.0
2014-08-18 19:48:27 +02:00
Jeroen van Baarsen e76b1ffde9 Merge pull request #7537 from Razer6/rake_tasks_style
Fix env variable style for documentation
2014-08-18 19:47:57 +02:00
Robert Schilling c0f9abad85 Fix env varable style for documentation 2014-08-18 19:08:46 +02:00
Martin Bastien 8eff8bcebf Fix color toggle for labels in edit view 2014-08-18 12:23:45 -04:00
Jacob Vosmaer 1db77dc14b Merge pull request #7534 from sue445/feature/add_webhook_doc
Add missing elements to webhook doc
2014-08-18 17:45:19 +02:00
Jacob Vosmaer a2ee746758 Merge pull request #7524 from Razer6/repo_settings_spelling_error
Fix minor spelling error in repo settings page
2014-08-18 17:44:32 +02:00
sue445 911e47a93d Add missing elements to webhook doc 2014-08-19 00:19:05 +09:00
Jacob Vosmaer 6dc24e3bcf Merge pull request #7527 from Razer6/api_labels_return_code
API: Fix labels return code
2014-08-18 17:16:32 +02:00
Jacob Vosmaer 2fd7d6e2ef Merge pull request #7493 from Razer6/update_gems_with_errors
Update gems with errors, to prevent 500 errors
2014-08-18 17:13:38 +02:00
Jacob Vosmaer 97288920d6 Merge pull request #7496 from Razer6/captalize_suggested_colors
Consistency: Capitalize hex values of sugested colors
2014-08-18 17:06:38 +02:00
Jacob Vosmaer 4142754c7f Bump version to 7.2.0.rc1 v7.2.0.rc1 2014-08-18 15:51:30 +02:00
Robert Schilling 4ca3f64719 Fix labels return code 2014-08-18 00:25:49 +02:00
Robert Schilling 2ca928d49a Fix minor spelling error 2014-08-17 19:58:57 +02:00
Jeroen van Baarsen 54c2083703 Merge pull request #7509 from cirosantilli/fix-md-style-api
Fix Md style for API.
2014-08-15 17:14:27 +02:00
Jeroen van Baarsen f05cec53bb Merge pull request #7508 from cirosantilli/md-style-projects
Fix Md style for projects API doc.
2014-08-15 17:14:13 +02:00
Jeroen van Baarsen 0965b18874 Merge pull request #7510 from jbrooksuk/patch-1
Fix grammar and spelling
2014-08-15 17:13:33 +02:00
Jeroen van Baarsen 6fffc20736 Merge pull request #7511 from jbrooksuk/api-docs
Consistency, spelling and grammar
2014-08-15 17:09:52 +02:00
James Brooks 3f36f84c1f Consistency, spelling and grammar 2014-08-15 15:03:01 +01:00
James Brooks f85dec2838 Fix grammar and spelling 2014-08-15 14:11:15 +01:00
Dmitriy Zaporozhets cb33279a0f Merge branch 'label-permissions' into 'master'
Label permissions

* Update label permission docs
* Add authorisation to labels via API

See merge request !1020
2014-08-15 12:25:34 +00:00
Dmitriy Zaporozhets a8d1cbbecc Merge branch 'git_max_size' into 'master'
Use new git max_size in the settings initializer

This allows us to avoid repeating default max_size setting in the omnibus-gitlab repository.

See merge request !1021
2014-08-15 10:07:29 +00:00
Jacob Vosmaer ec381a9308 Use new git max_size in the settings initializer 2014-08-15 11:38:32 +02:00
Robert Schilling 938eed1ef8 Consistency: Capitalize hex values of sugested colors 2014-08-15 11:02:05 +02:00
Dmitriy Zaporozhets 6063a1e6c1 Add labels api authorization. Update permission doc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-15 11:59:19 +03:00
Ciro Santilli a1d0997850 Fix Md style for projects API doc. 2014-08-15 10:52:37 +02:00
Dmitriy Zaporozhets 27cf081e1b Merge pull request #7479 from Razer6/feature/labels_api
Implement complete labels API (create/delete/update)
2014-08-15 10:25:48 +03: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 0602c5d027 Change default label color
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-15 10:20:12 +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
Ciro Santilli 2ada4ef062 Fix Md style for API. 2014-08-15 09:03:18 +02:00
Dmitriy Zaporozhets 7120af7251 Merge pull request #7281 from skv-headless/diff-unfold
unfold commits
2014-08-15 09:34:12 +03:00
Dmitriy Zaporozhets 45da59daab Mention username option for developers in gitlab.yml
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-14 15:15:48 +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
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00
Dmitriy Zaporozhets fdd8e45075 Merge branch 'remove-remove-label' into 'master'
Remove labels via ajax

See merge request !1019
2014-08-13 18:28:52 +00:00
Dmitriy Zaporozhets 1d63464c82 Fix repository archive
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-13 21:28:22 +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
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
Jeroen van Baarsen 2653ca6ee1 Merge pull request #7494 from Razer6/add_7_1_1_changelog
Add 7.1.1 patch release changelog
2014-08-13 17:09:58 +02:00
Dmitriy ZaporozhetsandRobert Schilling ea177b33b3 Add patch release changelog
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-08-13 17:06:23 +02:00