Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Document the extra.sign_in_text setting for CE | Jacob Vosmaer | 2014-08-20 | 2 | -0/+35 |
| | |||||
* | Bump version to 7.2.0.rc2v7.2.0.rc2 | Jacob Vosmaer | 2014-08-19 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fix_label_migration' into 'master' | Jacob Vosmaer | 2014-08-19 | 1 | -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 labels | Jacob Vosmaer | 2014-08-19 | 1 | -1/+1 |
| | | |||||
| * | Remove invalid characters from the label name | Jacob Vosmaer | 2014-08-19 | 1 | -1/+1 |
| | | |||||
| * | Test if the label is valid before creating link | Jacob Vosmaer | 2014-08-19 | 1 | -1/+1 |
|/ | |||||
* | Add 6.0-to-7.2.md guide ahead of 7.2 release | Jacob Vosmaer | 2014-08-19 | 1 | -0/+147 |
| | |||||
* | Add 7.1-to-7.2.md update guide | Jacob Vosmaer | 2014-08-19 | 1 | -0/+106 |
| | |||||
* | Merge pull request #7438 from bbodenmiller/patch-5 | Jeroen van Baarsen | 2014-08-18 | 1 | -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.0 | Ben Bodenmiller | 2014-08-04 | 1 | -0/+3 |
| | | | | | | backport of https://github.com/gitlabhq/gitlabhq/commit/2d681c0d1ed14bf23c041aa04fa3e77caceda9a1 | ||||
* | | Merge pull request #7537 from Razer6/rake_tasks_style | Jeroen van Baarsen | 2014-08-18 | 1 | -6/+6 |
|\ \ | | | | | | | Fix env variable style for documentation | ||||
| * | | Fix env varable style for documentation | Robert Schilling | 2014-08-18 | 1 | -6/+6 |
| | | | |||||
* | | | Merge pull request #7534 from sue445/feature/add_webhook_doc | Jacob Vosmaer | 2014-08-18 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Add missing elements to webhook doc | ||||
| * | | | Add missing elements to webhook doc | sue445 | 2014-08-19 | 1 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #7524 from Razer6/repo_settings_spelling_error | Jacob Vosmaer | 2014-08-18 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Fix minor spelling error in repo settings page | ||||
| * | | | Fix minor spelling error | Robert Schilling | 2014-08-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #7527 from Razer6/api_labels_return_code | Jacob Vosmaer | 2014-08-18 | 3 | -16/+15 |
|\ \ \ \ | | | | | | | | | | | API: Fix labels return code | ||||
| * | | | | Fix labels return code | Robert Schilling | 2014-08-18 | 3 | -16/+15 |
| |/ / / | |||||
* | | | | Merge pull request #7493 from Razer6/update_gems_with_errors | Jacob Vosmaer | 2014-08-18 | 2 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | Update gems with errors, to prevent 500 errors | ||||
| * | | | | Update org-ruby | Robert Schilling | 2014-08-13 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | Update gemnasium-gitlab-service | Robert Schilling | 2014-08-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #7496 from Razer6/captalize_suggested_colors | Jacob Vosmaer | 2014-08-18 | 2 | -8/+8 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Consistency: Capitalize hex values of sugested colors | ||||
| * | | | | Consistency: Capitalize hex values of sugested colors | Robert Schilling | 2014-08-15 | 2 | -8/+8 |
| | |/ / | |/| | | |||||
* | | | | Bump version to 7.2.0.rc1v7.2.0.rc1 | Jacob Vosmaer | 2014-08-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #7509 from cirosantilli/fix-md-style-api | Jeroen van Baarsen | 2014-08-15 | 6 | -85/+68 |
|\ \ \ \ | | | | | | | | | | | Fix Md style for API. | ||||
| * | | | | Fix Md style for API. | Ciro Santilli | 2014-08-15 | 6 | -85/+68 |
| | | | | | |||||
* | | | | | Merge pull request #7508 from cirosantilli/md-style-projects | Jeroen van Baarsen | 2014-08-15 | 1 | -89/+70 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix Md style for projects API doc. | ||||
| * | | | | | Fix Md style for projects API doc. | Ciro Santilli | 2014-08-15 | 1 | -89/+70 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #7510 from jbrooksuk/patch-1 | Jeroen van Baarsen | 2014-08-15 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix grammar and spelling | ||||
| * | | | | | Fix grammar and spelling | James Brooks | 2014-08-15 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #7511 from jbrooksuk/api-docs | Jeroen van Baarsen | 2014-08-15 | 6 | -13/+13 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Consistency, spelling and grammar | ||||
| * | | | | | Consistency, spelling and grammar | James Brooks | 2014-08-15 | 6 | -13/+13 |
|/ / / / / | |||||
* | | | | | Merge branch 'label-permissions' into 'master' | Dmitriy Zaporozhets | 2014-08-15 | 2 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Label permissions * Update label permission docs * Add authorisation to labels via API See merge request !1020 | ||||
| * | | | | | Add labels api authorization. Update permission doc | Dmitriy Zaporozhets | 2014-08-15 | 2 | -0/+4 |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | Merge branch 'git_max_size' into 'master' | Dmitriy Zaporozhets | 2014-08-15 | 1 | -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 initializer | Jacob Vosmaer | 2014-08-15 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #7479 from Razer6/feature/labels_api | Dmitriy Zaporozhets | 2014-08-15 | 11 | -41/+321 |
|\ \ \ \ | | | | | | | | | | | Implement complete labels API (create/delete/update) | ||||
| * | | | | Update labels via API | Robert Schilling | 2014-08-13 | 5 | -9/+126 |
| | | | | | |||||
| * | | | | Add, delete labels via API | Robert Schilling | 2014-08-13 | 10 | -42/+205 |
| | | | | | |||||
* | | | | | Merge pull request #7499 from skv-headless/fix-commit-msg | Dmitriy Zaporozhets | 2014-08-15 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix commit msg | ||||
| * | | | | | gfm and preserve commit message | skv | 2014-08-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | for commits#show | ||||
| * | | | | | whitespaceses at beginning of commit messages | skv | 2014-08-14 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Change default label color | Dmitriy Zaporozhets | 2014-08-15 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | Merge pull request #7465 from Razer6/better_label_color_validation | Dmitriy Zaporozhets | 2014-08-15 | 16 | -34/+245 |
|\ \ \ \ \ | | | | | | | | | | | | | Better label color validation, fixes #7454 | ||||
| * | | | | | Do label validation for issues/merge requests API | Robert Schilling | 2014-08-14 | 9 | -8/+108 |
| | | | | | | |||||
| * | | | | | Trigger an update of save button if user pressed a preview color | Robert Schilling | 2014-08-13 | 2 | -4/+6 |
| | | | | | | |||||
| * | | | | | Validate label titel in project scope | Robert Schilling | 2014-08-13 | 4 | -4/+47 |
| | | | | | | |||||
| * | | | | | Labels need to be valid on name | Robert Schilling | 2014-08-13 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | Add testcase for invalid color | Robert Schilling | 2014-08-13 | 3 | -2/+21 |
| | | | | | | |||||
| * | | | | | Move label coffeescript from view to class | Robert Schilling | 2014-08-13 | 2 | -24/+23 |
| | | | | | |