20543 Commits
Author SHA1 Message Date
Robert Speicher d6bcf446b1 Version 8.2.0 v8.2.0 2015-11-21 23:28:33 -05:00
Robert SpeicherandRobert Speicher dbcd646296 Merge branch 'award_fix' into 'master'
Emoji bug: Invalid url to image

Closes #3591

See merge request !1868
2015-11-21 23:11:45 -05:00
Dmitriy ZaporozhetsandRobert Speicher aeaa5b5037 Merge branch 'fix-merge-requests-without-source-projects' into 'master'
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-21 22:53:08 -05:00
Robert SpeicherandRobert Speicher 94b33caf84 Merge branch 'fix-award-emoji-api' into 'master'
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-21 22:46:18 -05:00
Stan HuandRobert Speicher 27821ce01f Merge branch 'consistent-tags-api' into 'master'
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-21 22:38:13 -05:00
Robert SpeicherandRobert Speicher 53c0b6213f Merge branch 'award_fix' into 'master'
Award Emoji: fix for merge requests

Closes #3597

See merge request !1865
2015-11-21 13:59:25 -05:00
Robert Speicher d241253fff Add award_emoji.png doc image
[ci skip]
2015-11-21 13:16:39 -05:00
Robert SpeicherandRobert Speicher 098aec21f7 Merge branch 'issue_3598' into 'master'
Remove accidentally added line.

Reference: #3598 

See merge request !1858
2015-11-21 12:20:44 -05:00
Stan HuandRobert Speicher 0df5340036 Merge branch 'fix-drone-service-hook' into 'master'
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-21 11:11:44 -05:00
Robert SpeicherandRobert Speicher ae36d23497 Merge branch 'award-emoji-doc' into 'master'
Use award emoticons in GitLab workflow

Remove the old voting slides and use the emoji bar.

[ci skip]

See merge request !1863
2015-11-21 11:09:19 -05:00
Robert SpeicherandRobert Speicher 81134fd03a Merge branch 'api-tags-doc' into 'master'
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-21 10:50:56 -05:00
Robert Speicher 3e48a136ac Version 8.2.0.rc2 v8.2.0.rc2 2015-11-20 11:18:48 -05:00
Jacob VosmaerandRobert Speicher b6ec1714a9 Merge branch 'workhorse-version' into 'master'
Bump GitLab Workhorse version to 0.4.2



See merge request !1830
2015-11-20 10:25:38 -05:00
Dmitriy Zaporozhets b6f0eddce5 Merge branch 'lfs-batch-download-to-stable' into '8-2-stable'
Lfs batch download to stable

!1842 for stable

See merge request !1853
2015-11-20 12:59:53 +00:00
Dmitriy Zaporozhets ea27943291 Merge branch 'lfs_on_by_default_and_backup' into '8-2-stable'
Lfs on by default and backup



See merge request !1852
2015-11-20 12:04:12 +00:00
Marin Jankovski 89dec03c73 Error 501 when client is using deprecated API. 2015-11-20 12:50:47 +01:00
Kamil TrzcinskiandMarin Jankovski 760dc3e42c Fix upload tests, reformat code and make rubocop happy 2015-11-20 12:50:45 +01:00
Kamil TrzcinskiandMarin Jankovski 7ea48bfb25 Part of tests done [ci skip] 2015-11-20 12:50:42 +01:00
Kamil TrzcinskiandMarin Jankovski 2811347884 Add support for batch download operation 2015-11-20 12:49:07 +01:00
Valery Sizov 6d13956572 Merge branch 'notes_fix_to_stable' into '8-2-stable'
Fix for Emoji (to stable)



See merge request !1850
2015-11-20 11:18:13 +00:00
Yorick Peterse cd44d16a0f Merge branch 'merge-1790-to-8-2-stable' into '8-2-stable'
See merge request !1851
2015-11-20 11:17:13 +00:00
Marin Jankovski 6fe8c226c5 Add lfs to backup specs. 2015-11-20 11:40:04 +01:00
Marin Jankovski a2001eecc7 Backup LFS objects same as any upload. 2015-11-20 11:39:53 +01:00
Marin Jankovski 03442eb346 Lfs on by default. 2015-11-20 11:39:38 +01:00
Robert SchillingandDmitriy Zaporozhets 5ac2c3f0aa Update LFS docs for cloning [ci skip] 2015-11-20 11:23:05 +01:00
Dmitriy Zaporozhets dc030ac1b4 Fix huge line height for diff files list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-20 11:21:36 +01:00
Yorick Peterse 1cdee35f60 Merge branch 'atom-feed-latest-update' into 'master'
Improve performance of user profiles, finding groups, and finding projects

This MR improves the following:

* Rendering of profile pages and Atom feeds
* Finding groups (using GroupsFinder & friends)
* Finding projects (using ProjectsFinder & friends)

Initially this MR was intended to only improve rendering of Atom feeds, but over time other fixes were introduced as well as the same code was the cause of all these problems.

See merge request !1790
2015-11-20 11:02:27 +01:00
Valery Sizov c279bd812e Fix for Emoji 2015-11-20 11:23:04 +02:00
Robert SpeicherandRobert Speicher 094bb6f8ef Merge branch 'rs-mr-reference-copy' into 'master'
Add clipboard button to merge request cross-project reference

See merge request !1847
2015-11-19 20:08:37 -05:00
Dmitriy ZaporozhetsandRobert Speicher 48e86ec610 Merge branch 'emoji_votes' into 'master'
Award Emoji

This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.

For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like "👍" and any other. You can post not only emoji that listed in the emoji picker.

See merge request !1825
2015-11-19 19:50:58 -05:00
Kamil TrzcińskiandRobert Speicher 978f0bac8a Merge branch 'ci-yaml-validation' into 'master'
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
2015-11-19 18:27:46 -05:00
Robert SpeicherandRobert Speicher 34207d1dfb Merge branch 'rs-safari-clipboard-fallback' into 'master'
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-19 18:25:59 -05:00
Robert SpeicherandRobert Speicher 64e3cba941 Merge branch 'dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow' into 'master'
Improve personal snippet access workflow.

Replaces !1709

Fixes #3258

See merge request !1817
2015-11-19 12:22:45 -05:00
Robert SpeicherandRobert Speicher 463a3cfe09 Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master'
Add option to create merge request when editing/creating a file

Replaces !1611 

Fixes #3059

See merge request !1820
2015-11-19 11:46:24 -05:00
Robert SpeicherandRobert Speicher 5bf300f2b9 Merge branch 'new-tag-textarea' into 'master'
Fix 'Attach a file' link in new tag form

Also removed a little bit of code repetition :)

See merge request !1834
2015-11-19 10:40:38 -05:00
Robert SpeicherandRobert Speicher 9535d91e8d Merge branch 'update-gitlab-shell-doc' into 'master'
Update gitlab-shell documentation to 2.6.7



See merge request !1836
2015-11-19 10:10:00 -05:00
Job van der VoortandRobert Speicher 506e0be36b Merge branch 'lfs-client-doc' into 'master'
Add link to git-lfs client  [ci skip]



See merge request !1832
2015-11-19 09:57:04 -05:00
Dmitriy ZaporozhetsandRobert Speicher 61c6e96971 Merge branch 'check_if_it_should_be_archived_in_backup' into 'master'
Check which folders and archives should be packed before passing to tar command.

If user uses backup task with SKIP and skips one of the archives listed(uploads, builds, artifacts) backup create will give an error: `Cannot stat: No such file or directory`.

This MR fixes that by checking for skipped items.
Additionally, compact everything to avoid `TypeError: no implicit conversion of nil into String` errors.

See merge request !1824
2015-11-19 09:50:07 -05:00
Job van der VoortandRobert Speicher 32771f06f1 Merge branch 'add_lfs_doc' into 'master'
Documentation for Git LFS

Doc explaining how to use Git LFS, how to use Git LFS with GitLab, known issues and troubleshooting tips.

See merge request !1813
2015-11-19 09:48:38 -05:00
Dmitriy ZaporozhetsandRobert Speicher 71cb328b4a Merge branch 'update_nginx_deploy' into 'master'
Deploy page should be shown for all pages not just root

Related to change already merged to Omnibus - gitlab-org/omnibus-gitlab!540

This change makes it so the deploy page is shown on all GitLab pages if the page exists. Users will no longer receive the 502 when deploys are happening.

See merge request !1828
2015-11-19 09:44:12 -05:00
Robert SpeicherandRobert Speicher 2dd4314fae Merge branch 'client-max-body-size' into 'master'
Do not limit workhorse POST/PUT size in NGINX

Limiting, if any, should happen in gitlab-workhorse.

See merge request !1831
2015-11-19 09:42:17 -05:00
Douwe MaanandRobert Speicher 371e8505f8 Merge branch 'ce-mirror-backport' into 'master'
Backport relevant changes from gitlab-org/gitlab-ee!51

To do:

- [x] Update gitlab-shell

See merge request !1822
2015-11-18 16:41:56 -05:00
Robert Speicher 8382fac7cc Update CHANGELOG
[ci skip]
2015-11-17 15:19:20 -05:00
Robert SpeicherandRobert Speicher ea5a10b065 Merge branch 'compare-first-commit' into 'master'
Correctly set comparison first commit when range includes a merge commit

Fixes #3207.

See merge request !1814
2015-11-17 13:52:09 -05:00
Robert Speicher 17a0cd46cc Merge branch 'contributor-graph-by-email' into 'master'
See merge request !1705
2015-11-17 13:49:48 -05:00
Robert SpeicherandRobert Speicher c9f0324701 Merge branch 'adamliesko/gitlab-ce-notification-upon-unassignment' into 'master'
Add notification to the former assignee upon unassignment

Replaces !1769

Fixes #3395

See merge request !1818
2015-11-17 13:28:58 -05:00
Robert SpeicherandRobert Speicher 8a1cafeb9d Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master'
Prevent the last owner of a group from being able to delete themselves
by 'adding' themselves as a master

Replaces !1708.

Fixes #1111.

See merge request !1815
2015-11-17 13:24:15 -05:00
Robert Speicher 1ec7cea597 Merge branch 'param-view' into 'master'
See merge request !1816
2015-11-17 12:06:34 -05:00
Robert Speicher e55145b028 Merge branch 'master' into 8-2-stable 2015-11-17 11:07:05 -05:00
Robert Speicher 85102d094f Update CHANGELOG
[ci skip]
2015-11-17 11:03:02 -05:00