summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Document the extra.sign_in_text setting for CEJacob Vosmaer2014-08-202-0/+35
|
* Bump version to 7.2.0.rc2v7.2.0.rc2Jacob Vosmaer2014-08-191-1/+1
|
* Merge branch 'fix_label_migration' into 'master'Jacob Vosmaer2014-08-191-3/+3
|\ | | | | | | | | | | | | | | | | | | 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
| * Use the default color when migrating labelsJacob Vosmaer2014-08-191-1/+1
| |
| * Remove invalid characters from the label nameJacob Vosmaer2014-08-191-1/+1
| |
| * Test if the label is valid before creating linkJacob Vosmaer2014-08-191-1/+1
|/
* Add 6.0-to-7.2.md guide ahead of 7.2 releaseJacob Vosmaer2014-08-191-0/+147
|
* Add 7.1-to-7.2.md update guideJacob Vosmaer2014-08-191-0/+106
|
* Merge pull request #7438 from bbodenmiller/patch-5Jeroen van Baarsen2014-08-181-0/+3
|\ | | | | Add dealing with newlines for editor to 5.1-to-6.0
| * Add dealing with newlines for editor to 5.1-to-6.0Ben Bodenmiller2014-08-041-0/+3
| | | | | | backport of https://github.com/gitlabhq/gitlabhq/commit/2d681c0d1ed14bf23c041aa04fa3e77caceda9a1
* | Merge pull request #7537 from Razer6/rake_tasks_styleJeroen van Baarsen2014-08-181-6/+6
|\ \ | | | | | | Fix env variable style for documentation
| * | Fix env varable style for documentationRobert Schilling2014-08-181-6/+6
| | |
* | | Merge pull request #7534 from sue445/feature/add_webhook_docJacob Vosmaer2014-08-181-1/+3
|\ \ \ | | | | | | | | Add missing elements to webhook doc
| * | | Add missing elements to webhook docsue4452014-08-191-1/+3
| | | |
* | | | Merge pull request #7524 from Razer6/repo_settings_spelling_errorJacob Vosmaer2014-08-181-1/+1
|\ \ \ \ | |_|/ / |/| | | Fix minor spelling error in repo settings page
| * | | Fix minor spelling errorRobert Schilling2014-08-171-1/+1
| | | |
* | | | Merge pull request #7527 from Razer6/api_labels_return_codeJacob Vosmaer2014-08-183-16/+15
|\ \ \ \ | | | | | | | | | | API: Fix labels return code
| * | | | Fix labels return codeRobert Schilling2014-08-183-16/+15
| |/ / /
* | | | Merge pull request #7493 from Razer6/update_gems_with_errorsJacob Vosmaer2014-08-182-5/+5
|\ \ \ \ | | | | | | | | | | Update gems with errors, to prevent 500 errors
| * | | | Update org-rubyRobert Schilling2014-08-132-4/+4
| | | | |
| * | | | Update gemnasium-gitlab-serviceRobert Schilling2014-08-131-1/+1
| | | | |
* | | | | Merge pull request #7496 from Razer6/captalize_suggested_colorsJacob Vosmaer2014-08-182-8/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | Consistency: Capitalize hex values of sugested colors
| * | | | Consistency: Capitalize hex values of sugested colorsRobert Schilling2014-08-152-8/+8
| | |/ / | |/| |
* | | | Bump version to 7.2.0.rc1v7.2.0.rc1Jacob Vosmaer2014-08-181-1/+1
| | | |
* | | | Merge pull request #7509 from cirosantilli/fix-md-style-apiJeroen van Baarsen2014-08-156-85/+68
|\ \ \ \ | | | | | | | | | | Fix Md style for API.
| * | | | Fix Md style for API.Ciro Santilli2014-08-156-85/+68
| | | | |
* | | | | Merge pull request #7508 from cirosantilli/md-style-projectsJeroen van Baarsen2014-08-151-89/+70
|\ \ \ \ \ | | | | | | | | | | | | Fix Md style for projects API doc.
| * | | | | Fix Md style for projects API doc.Ciro Santilli2014-08-151-89/+70
| | |/ / / | |/| | |
* | | | | Merge pull request #7510 from jbrooksuk/patch-1Jeroen van Baarsen2014-08-151-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix grammar and spelling
| * | | | | Fix grammar and spellingJames Brooks2014-08-151-2/+2
| | | | | |
* | | | | | Merge pull request #7511 from jbrooksuk/api-docsJeroen van Baarsen2014-08-156-13/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Consistency, spelling and grammar
| * | | | | Consistency, spelling and grammarJames Brooks2014-08-156-13/+13
|/ / / / /
* | | | | Merge branch 'label-permissions' into 'master'Dmitriy Zaporozhets2014-08-152-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Label permissions * Update label permission docs * Add authorisation to labels via API See merge request !1020
| * | | | | Add labels api authorization. Update permission docDmitriy Zaporozhets2014-08-152-0/+4
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'git_max_size' into 'master'Dmitriy Zaporozhets2014-08-151-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Use new git max_size in the settings initializerJacob Vosmaer2014-08-151-1/+1
|/ / / /
* | | | Merge pull request #7479 from Razer6/feature/labels_apiDmitriy Zaporozhets2014-08-1511-41/+321
|\ \ \ \ | | | | | | | | | | Implement complete labels API (create/delete/update)
| * | | | Update labels via APIRobert Schilling2014-08-135-9/+126
| | | | |
| * | | | Add, delete labels via APIRobert Schilling2014-08-1310-42/+205
| | | | |
* | | | | Merge pull request #7499 from skv-headless/fix-commit-msgDmitriy Zaporozhets2014-08-152-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix commit msg
| * | | | | gfm and preserve commit messageskv2014-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | for commits#show
| * | | | | whitespaceses at beginning of commit messagesskv2014-08-141-1/+1
| |/ / / /
* | | | | Change default label colorDmitriy Zaporozhets2014-08-152-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge pull request #7465 from Razer6/better_label_color_validationDmitriy Zaporozhets2014-08-1516-34/+245
|\ \ \ \ \ | | | | | | | | | | | | Better label color validation, fixes #7454
| * | | | | Do label validation for issues/merge requests APIRobert Schilling2014-08-149-8/+108
| | | | | |
| * | | | | Trigger an update of save button if user pressed a preview colorRobert Schilling2014-08-132-4/+6
| | | | | |
| * | | | | Validate label titel in project scopeRobert Schilling2014-08-134-4/+47
| | | | | |
| * | | | | Labels need to be valid on nameRobert Schilling2014-08-131-1/+4
| | | | | |
| * | | | | Add testcase for invalid colorRobert Schilling2014-08-133-2/+21
| | | | | |
| * | | | | Move label coffeescript from view to classRobert Schilling2014-08-132-24/+23
| | | | | |