summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'issue-2831' into 'master' Douwe Maan2015-11-232-5/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Assignee selector when 'Unassigned' #2831 Fixes #2831 ![Screen_Shot_2015-11-21_at_12.04.42_AM](/uploads/e3cb98ff805366805f4a989d927e3f10/Screen_Shot_2015-11-21_at_12.04.42_AM.png) See merge request !1860
| * | | | | | | | | Fix Assignee selector when 'Unassigned' #2831Jose Corcuera2015-11-202-5/+11
| | | | | | | | | |
* | | | | | | | | | Update doc/release/patch.md with more current patch proceduresRobert Speicher2015-11-221-8/+32
| |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'award_fix' into 'master' Robert Speicher2015-11-222-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emoji bug: Invalid url to image Closes #3591 See merge request !1868
| * | | | | | | | | Emoji bug: Invalid url to imageaward_fixValery Sizov2015-11-222-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-award-emoji-api' into 'master' Robert Speicher2015-11-225-10/+58
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add upvote/downvote fields to merge request and note API to preserve compatibility As discussed in !1825 we should not break the API compatibility. * This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`. * Add the fields `upvote`/`downvote` to the notes API, which always return `false` This behavior is documented in the API docs. See merge request !1867
| * | | | | | | | | | Add upvote/downvote fields to merge request and note API to preserve ↵fix-award-emoji-apiRobert Schilling2015-11-215-10/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatibility
* | | | | | | | | | | Merge branch 'consistent-tags-api' into 'master' Stan Hu2015-11-217-24/+196
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make tag API for release feature consistent Make tags API consistent with other tags methods. This changes the endpoint from `PUT /projects/:id/repository/:tag/release` to `PUT /projects/:id/repository/tags/:tag_name/release`. On thing the API is still missing, is an error if the tag does not exist. Right now it returns 200 even the tag does not exist. I'll fix that such it returns 404. @stanhu Can you review? @rspeicher This MR should go into 8.2 See merge request !1864
| * | | | | | | | | | Allow editing a release in API via PUT methodRobert Schilling2015-11-215-1/+112
| | | | | | | | | | |
| * | | | | | | | | | Only allow to create a release if it does not exist yetRobert Schilling2015-11-214-8/+30
| | | | | | | | | | |
| * | | | | | | | | | Use POST to create a new release instead of PUTRobert Schilling2015-11-213-8/+8
| | | | | | | | | | |
| * | | | | | | | | | API: Return 404 if the tag for a release does not existRobert Schilling2015-11-215-9/+47
| | | | | | | | | | |
| * | | | | | | | | | Make tag API consistent for release featureRobert Schilling2015-11-214-13/+14
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'ci-doc-yaml' into 'master' Kamil Trzciński2015-11-211-49/+41
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI yaml syntax documentation [ci skip] See merge request !1866
| * | | | | | | | | | | Fix CI yaml syntax documentation [ci skip]Kamil Trzcinski2015-11-211-49/+41
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'award_fix' into 'master' Robert Speicher2015-11-211-2/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Award Emoji: fix for merge requests Closes #3597 See merge request !1865
| * | | | | | | | | | Award: merge request fixValery Sizov2015-11-211-2/+5
| | | | | | | | | | |
* | | | | | | | | | | Add award_emoji.png doc imageRobert Speicher2015-11-211-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge branch 'issue_3598' into 'master' Robert Speicher2015-11-211-3/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove accidentally added line. Reference: #3598 See merge request !1858
| * | | | | | | | | | Remove accidentally added line. #3598issue_3598Rubén Dávila2015-11-201-3/+0
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | It should exist in EE only.
* | | | | | | | | | Merge branch 'award-emoji-doc' into 'master' Robert Speicher2015-11-212-5/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use award emoticons in GitLab workflow Remove the old voting slides and use the emoji bar. [ci skip] See merge request !1863
| * | | | | | | | | Use award emoticons in GitLab workflow [ci skip]Robert Schilling2015-11-212-5/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'api-tags-doc' into 'master' Robert Speicher2015-11-211-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tags page to readme The tags page was separated for the release feature but not to the index readme. [ci skip] See merge request !1861
| * | | | | | | | | Add tags page to readme [ci skip]api-tags-docRobert Schilling2015-11-211-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-merge-requests-without-source-projects' into 'master' Dmitriy Zaporozhets2015-11-212-1/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle removed source projects in MR CI commits Fixes #3599 @dzaporozhets assigning this to you since you wrote the original code. Perhaps checking for the source project isn't the right way, but I'm not sure if there's a better way (e.g. somewhere earlier in the process) that we can detect this. See merge request !1859
| * | | | | | | | | Handle removed source projects in MR CI commitsfix-merge-requests-without-source-projectsYorick Peterse2015-11-202-1/+26
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling MergeRequest#ci_commit the code would previously raise an error if the source project no longer existed (e.g. because the user removed their fork). See #3599 for more information.
* | | | | | | | | Merge branch 'gitlab-ee-d39de0ea-backport' into 'master' Dmitriy Zaporozhets2015-11-212-10/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port GitLab EE ProjectsFinder changes These changes were added in GitLab EE commit d39de0ea91b26b8840195e5674b92c353cc16661. The tests were a bit bugged (they used a non existing group, thus not testing a crucial part) which I only noticed when porting CE changes to EE. See merge request !1854
| * | | | | | | | | Port GitLab EE ProjectsFinder changesgitlab-ee-d39de0ea-backportYorick Peterse2015-11-202-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes were added in GitLab EE commit d39de0ea91b26b8840195e5674b92c353cc16661. The tests were a bit bugged (they used a non existing group, thus not testing a crucial part) which I only noticed when porting CE changes to EE.
* | | | | | | | | | Merge branch 'ee-flog' into 'master' Dmitriy Zaporozhets2015-11-212-31/+27
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce method complexity in AutocompleteController Backport of gitlab-org/gitlab-ee!58 See merge request !1833
| * | | | | | | | | Reduce method complexity in AutocompleteControlleree-flogDouwe Maan2015-11-202-31/+27
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-scss-syntax-error' into 'master' Stan Hu2015-11-201-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix syntax error in common.scss Fix a syntax error. See merge request !1857
| * | | | | | | | | | fix syntax error in common.scssGreg Smethells2015-11-201-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix-drone-service-hook' into 'master' Stan Hu2015-11-201-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Drone web hook URL not being updated Fixes regression of !1774: fixes Drone Web hook for both service templates and project services. See merge request !1856
| * | | | | | | | | Fix Drone web hook URL not being updatedStan Hu2015-11-201-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'workhorse-version' into 'master' Jacob Vosmaer2015-11-204-5/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump GitLab Workhorse version to 0.4.2 See merge request !1830
| * | | | | | | | | Update gitlab-workhorse docs to 0.4.2workhorse-versionRobert Schilling2015-11-192-3/+3
| | | | | | | | | |
| * | | | | | | | | Bump GitLab Workhorse version to 0.4.2Kamil Trzcinski2015-11-192-2/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'lfs-batch-download' into 'master' Marin Jankovski2015-11-203-283/+419
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for batch download operation - Drops Accept for all download requests, - Allows to do batch download for public projects and non-authorized users - Returns 501 for legacy API with message to upgrade the client /cc @marin @jacobvosmaer @yorickpeterse See merge request !1842
| * | | | | | | | | | Error 501 when client is using deprecated API.Marin Jankovski2015-11-203-195/+49
| | | | | | | | | | |
| * | | | | | | | | | Fix upload tests, reformat code and make rubocop happyKamil Trzcinski2015-11-202-122/+110
| | | | | | | | | | |
| * | | | | | | | | | Part of tests done [ci skip]Kamil Trzcinski2015-11-202-104/+338
| | | | | | | | | | |
| * | | | | | | | | | Add support for batch download operationlfs-batch-downloadKamil Trzcinski2015-11-193-36/+96
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'notes_fix_stable' into 'master' Dmitriy Zaporozhets2015-11-204-4/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for Emoji See merge request !1849
| * | | | | | | | | | Fix for Emojinotes_fix_stablenotes_fixValery Sizov2015-11-204-4/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'lfs_default_and_backup' into 'master' Dmitriy Zaporozhets2015-11-207-9/+47
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lfs default and backup Part of gitlab-org/gitlab-ce#2955 See merge request !1823
| * | | | | | | | | | | Add lfs to backup specs.lfs_default_and_backupMarin Jankovski2015-11-191-5/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Backup LFS objects same as any upload.Marin Jankovski2015-11-194-2/+36
| | | | | | | | | | | |
| * | | | | | | | | | | Lfs on by default.Marin Jankovski2015-11-192-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'update-docs' into 'master' Achilleas Pipinellis2015-11-204-9/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More GitLab spellings. No dedicated CI in omnibus See merge request !1838
| * | | | | | | | | | | More GitLab spellings. No dedicated CI in omnibus [ci skip]update-docsRobert Schilling2015-11-194-9/+7
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |