Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-11-23Add bundler-audit to CIDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-23Merge branch 'issue_2993' into 'master' Dmitriy Zaporozhets
Update copy used in alert message when deleting branches or tags. Reference: #2993 Before: ![Screen_Shot_2015-11-19_at_4.10.34_PM](/uploads/5cdf7e8c5d4c6bd9e18584b118420c8c/Screen_Shot_2015-11-19_at_4.10.34_PM.png) ![Screen_Shot_2015-11-19_at_4.14.19_PM](/uploads/80513b96492122860733462efa8c8015/Screen_Shot_2015-11-19_at_4.14.19_PM.png) After: ![Screen_Shot_2015-11-19_at_4.59.56_PM](/uploads/80367f2acea0d22d36a5297bdc29163e/Screen_Shot_2015-11-19_at_4.59.56_PM.png) ![Screen_Shot_2015-11-19_at_4.59.30_PM](/uploads/134cf02d1fb3feff2159b5659d149d54/Screen_Shot_2015-11-19_at_4.59.30_PM.png) See merge request !1846
2015-11-23Merge branch 'issue-2831' into 'master' Douwe Maan
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
2015-11-23Update doc/release/patch.md with more current patch proceduresRobert Speicher
[ci skip]
2015-11-22Merge branch 'award_fix' into 'master' Robert Speicher
Emoji bug: Invalid url to image Closes #3591 See merge request !1868
2015-11-22Merge branch 'fix-award-emoji-api' into 'master' Robert Speicher
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
2015-11-22Emoji bug: Invalid url to imageValery Sizov
2015-11-22Merge branch 'consistent-tags-api' into 'master' Stan Hu
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
2015-11-22Allow editing a release in API via PUT methodRobert Schilling
2015-11-22Only allow to create a release if it does not exist yetRobert Schilling
2015-11-21Add upvote/downvote fields to merge request and note API to preserve ↵Robert Schilling
compatibility
2015-11-21Merge branch 'ci-doc-yaml' into 'master' Kamil Trzciński
Fix CI yaml syntax documentation [ci skip] See merge request !1866
2015-11-21Fix CI yaml syntax documentation [ci skip]Kamil Trzcinski
2015-11-21Merge branch 'award_fix' into 'master' Robert Speicher
Award Emoji: fix for merge requests Closes #3597 See merge request !1865
2015-11-21Add award_emoji.png doc imageRobert Speicher
[ci skip]
2015-11-21Use POST to create a new release instead of PUTRobert Schilling
2015-11-21Merge branch 'issue_3598' into 'master' Robert Speicher
Remove accidentally added line. Reference: #3598 See merge request !1858
2015-11-21Award: merge request fixValery Sizov
2015-11-21API: Return 404 if the tag for a release does not existRobert Schilling
2015-11-21Make tag API consistent for release featureRobert Schilling
2015-11-21Merge branch 'award-emoji-doc' into 'master' Robert Speicher
Use award emoticons in GitLab workflow Remove the old voting slides and use the emoji bar. [ci skip] See merge request !1863
2015-11-21Use award emoticons in GitLab workflow [ci skip]Robert Schilling
2015-11-21Merge branch 'api-tags-doc' into 'master' Robert Speicher
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
2015-11-21Add tags page to readme [ci skip]Robert Schilling
2015-11-21Merge branch 'fix-merge-requests-without-source-projects' into 'master' Dmitriy Zaporozhets
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
2015-11-21Merge branch 'gitlab-ee-d39de0ea-backport' into 'master' Dmitriy Zaporozhets
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
2015-11-21Merge branch 'ee-flog' into 'master' Dmitriy Zaporozhets
Reduce method complexity in AutocompleteController Backport of gitlab-org/gitlab-ee!58 See merge request !1833
2015-11-21Fix Assignee selector when 'Unassigned' #2831Jose Corcuera
2015-11-21Handle removed source projects in MR CI commitsYorick Peterse
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.
2015-11-21Remove accidentally added line. #3598Rubén Dávila
It should exist in EE only.
2015-11-20Merge branch 'fix-scss-syntax-error' into 'master' Stan Hu
fix syntax error in common.scss Fix a syntax error. See merge request !1857
2015-11-20fix syntax error in common.scssGreg Smethells
2015-11-20Merge branch 'fix-drone-service-hook' into 'master' Stan Hu
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
2015-11-20Fix Drone web hook URL not being updatedStan Hu
2015-11-20Port GitLab EE ProjectsFinder changesYorick Peterse
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.
2015-11-20Reduce method complexity in AutocompleteControllerDouwe Maan
2015-11-20Merge branch 'workhorse-version' into 'master' Jacob Vosmaer
Bump GitLab Workhorse version to 0.4.2 See merge request !1830
2015-11-20Merge branch 'lfs-batch-download' into 'master' Marin Jankovski
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
2015-11-20Error 501 when client is using deprecated API.Marin Jankovski
2015-11-20Fix upload tests, reformat code and make rubocop happyKamil Trzcinski
2015-11-20Part of tests done [ci skip]Kamil Trzcinski
2015-11-20Merge branch 'notes_fix_stable' into 'master' Dmitriy Zaporozhets
Fix for Emoji See merge request !1849
2015-11-20Fix for EmojiValery Sizov
2015-11-20Merge branch 'lfs_default_and_backup' into 'master' Dmitriy Zaporozhets
Lfs default and backup Part of gitlab-org/gitlab-ce#2955 See merge request !1823
2015-11-20Merge branch 'update-docs' into 'master' Achilleas Pipinellis
More GitLab spellings. No dedicated CI in omnibus See merge request !1838
2015-11-20Merge branch 'update-lfs-docs' into 'master' Marin Jankovski
Update LFS docs for cloning Cloning the repo already downloads the LFS tracked files. See merge request !1839
2015-11-20Merge branch 'rs-mr-reference-copy' into 'master' Robert Speicher
Add clipboard button to merge request cross-project reference See merge request !1847
2015-11-20Add clipboard button to merge request cross-project referenceRobert Speicher
2015-11-20Merge branch 'rs-safari-clipboard-fallback' into 'master' Robert Speicher
Add a fallback for Safari copy-to-clipboard Also, hide the tooltip in a less stupid way. Closes #3547 See merge request !1844
2015-11-20Merge branch 'ci-yaml-validation' into 'master' Kamil Trzciński
Commits without .gitlab-ci.yml are marked as skipped - Commits without .gitlab-ci.yml are marked as skipped - Save detailed error when YAML syntax This also fixes: #3521 #3546 /cc @jacobvosmaer See merge request !1827