summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix grammar and spellingJames Brooks2014-08-151-2/+2
|
* 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
| | |
| * | Disable label submit button if any field is emptyRobert Schilling2014-08-134-3/+48
| | |
* | | Merge pull request #7281 from skv-headless/diff-unfoldDmitriy Zaporozhets2014-08-1517-15/+164
|\ \ \ | | | | | | | | unfold commits
| * | | diff unfoldskv2014-08-1417-15/+164
| | | |
* | | | Mention username option for developers in gitlab.ymlDmitriy Zaporozhets2014-08-141-0/+5
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'remove-remove-label' into 'master'Dmitriy Zaporozhets2014-08-132-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | Remove labels via ajax See merge request !1019
| * | | Remove labels with ajax requestDmitriy Zaporozhets2014-08-132-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix repository archiveDmitriy Zaporozhets2014-08-133-14/+16
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Make default sing-in logo smallerDmitriy Zaporozhets2014-08-132-1/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #7494 from Razer6/add_7_1_1_changelogJeroen van Baarsen2014-08-131-0/+5
|\ \ \ | | | | | | | | Add 7.1.1 patch release changelog
| * | | Add patch release changelogDmitriy Zaporozhets2014-08-131-0/+5
|/ / / | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
* | | Merge pull request #7475 from bbodenmiller/curl-redirectsJeroen van Baarsen2014-08-138-9/+9
|\ \ \ | | | | | | | | follow curl redirects
| * | | follow curl redirectsBen Bodenmiller2014-08-118-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update `curl` commands to follow redirects (see http://curl.haxx.se/docs/manpage.html#-L). Current `curl` commands will return unexpected results if the requested content has been moved and is returning information about where it has been moved to. Including the `-L` option tells `curl` to follow the redirect so the file can be correctly acquired.
* | | | Merge pull request #6788 from CingleVue/masterDmitriy Zaporozhets2014-08-132-3/+8
|\ \ \ \ | | | | | | | | | | Patched `MergeRequest` to return more data.
| * | | | Patched `MergeRequest` to return more data.mabdullah-cinglevue2014-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | Added milestone to merge_requests instead of milestone id.
| * | | | # This is a combination of 2 commits.mabdullah-cinglevue2014-08-012-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # The first commit's message is: Patched `MergeRequest` to return more data. Patched `MergeRequest` to return the `description` & `milestone` Conflicts: lib/api/entities.rb # This is the 2nd commit message: Update merge_requests.md Update documentation for merge request endpoint adding support for description.
* | | | | Merge pull request #7189 from skv-headless/fix_duplicate_event_loadingDmitriy Zaporozhets2014-08-131-12/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | prevent events duplication loading
| * | | | prevent events loading while loading events refs #49759skv2014-06-241-12/+10
| | | | |
* | | | | Merge pull request #7308 from Azaret/fix_milestone_description_max_lengthDmitriy Zaporozhets2014-08-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix milestones description's max length
| * | | | | Fix milestones description's max lengthGregoire Daussin2014-07-151-1/+1
| | | | | |
* | | | | | Merge pull request #7312 from ↵Dmitriy Zaporozhets2014-08-131-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | hiroponz/fix-404-when-clicking-link-on-hipchat-message Fix 404 error when clicking the branch link on hipchat message
| * | | | | | Fix 404 error when clicking the branch link on hipchat messageHiroyuki Sato2014-07-181-2/+6
| | | | | | |
* | | | | | | Merge pull request #7426 from Razer6/rtrim_note_inputDmitriy Zaporozhets2014-08-131-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | rtrim() input before checking if note form is empty
| * | | | | | | Rtrim input before checking if form is emptyRobert Schilling2014-08-041-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #7441 from bbodenmiller/patch-7Dmitriy Zaporozhets2014-08-131-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add git config --global core.autocrlf check
| * | | | | | | add git config --global core.autocrlf checkBen Bodenmiller2014-08-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | core.autocrlf was added to install guide in https://github.com/gitlabhq/gitlabhq/commit/2d681c0d1ed14bf23c041aa04fa3e77caceda9a1 but not added to check script
* | | | | | | | Merge pull request #7483 from cirosantilli/commit-area-resize-verticalDmitriy Zaporozhets2014-08-131-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Restrict commit area resize to vertical.
| * | | | | | | | Restrict commit area resize to vertical.Ciro Santilli2014-08-121-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'bump_gitlab_git' into 'master'Dmitriy Zaporozhets2014-08-131-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab git Fixes #1394 See merge request !1015
| * | | | | | | | | Update gitlab_gitDmitriy Zaporozhets2014-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Bump gitlab_gitDmitriy Zaporozhets2014-08-121-5/+5
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'ldap/cache_check' into 'master'Dmitriy Zaporozhets2014-08-136-24/+62
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache LDAP check everywhere See merge request !1008