delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Version 8.2.1v8.2.1	Jacob Vosmaer	2015-11-25	1	-1/+1
\|
*	Merge branch 'bump-gitlab-shell-stable' into '8-2-stable'	Dmitriy Zaporozhets	2015-11-25	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab-shell to 2.6.8 in stable Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For gitlab/gitlabhq#2635 See merge request !1940
\| *	Bump gitlab-shell to 2.6.8	Dmitriy Zaporozhets	2015-11-25	1	-1/+1
\|/ \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'session_expire_delay_cannot_be_nil' into 'master'	Robert Speicher	2015-11-24	1	-2/+3
\| \| \| \| \| \| \|	Maybe rescue session_expire_delay by setting a default value. Related to gitlab-org/omnibus-gitlab#956 See merge request !1880
*	Merge branch 'required_version_and_docs_update' into 'master'	Dmitriy Zaporozhets	2015-11-24	6	-43/+77
\| \| \| \| \| \| \|	Update required version of lfs client and separate the docs for users and admins. See merge request !1855
*	Merge branch 'ci-artifacts-path' into 'master'	Robert Speicher	2015-11-23	7	-6/+22
\| \| \| \| \| \| \| \| \| \| \| \|	Expose artifacts path This fixes broken artifacts storage path. Fixes #3607 Fixes #3608 Related: gitlab-org/omnibus-gitlab!544 See merge request !1869
*	Update CHANGELOG	Robert Speicher	2015-11-23	1	-2/+0
\| \| \| \|	[ci skip]
*	Merge branch 'ci-fix-500' into 'master'	Robert Speicher	2015-11-23	4	-0/+10
\| \| \| \| \| \| \| \| \| \| \|	Fix 500 when using CI - Fix for Ci::Build state machine, allowing to process builds without the project - Forcefully update builds that didn't want to update with state machine - Fix saving GitLabCiService as Admin Template Fixes #3556 See merge request !1873
*	Merge branch 'fix-clipboard-styling-in-create-mr' into 'master'	Robert Speicher	2015-11-23	1	-0/+4
\| \| \| \| \| \| \|	Fix CSS styling for clipboard icon in new MR page Closes #3602 See merge request !1870
*	Version 8.2.0v8.2.0	Robert Speicher	2015-11-21	1	-1/+1
\|
*	Merge branch 'award_fix' into 'master'	Robert Speicher	2015-11-21	2	-2/+2
\| \| \| \| \| \| \|	Emoji bug: Invalid url to image Closes #3591 See merge request !1868
*	Merge branch 'fix-merge-requests-without-source-projects' into 'master'	Dmitriy Zaporozhets	2015-11-21	2	-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
*	Merge branch 'fix-award-emoji-api' into 'master'	Robert Speicher	2015-11-21	5	-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
*	Merge branch 'consistent-tags-api' into 'master'	Stan Hu	2015-11-21	7	-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
*	Merge branch 'award_fix' into 'master'	Robert Speicher	2015-11-21	1	-2/+5
\| \| \| \| \| \| \|	Award Emoji: fix for merge requests Closes #3597 See merge request !1865
*	Add award_emoji.png doc image	Robert Speicher	2015-11-21	1	-0/+0
\| \| \| \|	[ci skip]
*	Merge branch 'issue_3598' into 'master'	Robert Speicher	2015-11-21	1	-3/+0
\| \| \| \| \| \| \|	Remove accidentally added line. Reference: #3598 See merge request !1858
*	Merge branch 'fix-drone-service-hook' into 'master'	Stan Hu	2015-11-21	1	-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
*	Merge branch 'award-emoji-doc' into 'master'	Robert Speicher	2015-11-21	2	-5/+4
\| \| \| \| \| \| \| \| \|	Use award emoticons in GitLab workflow Remove the old voting slides and use the emoji bar. [ci skip] See merge request !1863
*	Merge branch 'api-tags-doc' into 'master'	Robert Speicher	2015-11-21	1	-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
*	Version 8.2.0.rc2v8.2.0.rc2	Robert Speicher	2015-11-20	1	-1/+1
\|
*	Merge branch 'workhorse-version' into 'master'	Jacob Vosmaer	2015-11-20	4	-5/+4
\| \| \| \| \| \| \|	Bump GitLab Workhorse version to 0.4.2 See merge request !1830
*	Merge branch 'lfs-batch-download-to-stable' into '8-2-stable'	Dmitriy Zaporozhets	2015-11-20	3	-283/+419
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Lfs batch download to stable !1842 for stable See merge request !1853
\| *	Error 501 when client is using deprecated API.lfs-batch-download-to-stable	Marin Jankovski	2015-11-20	3	-195/+49
\| \|
\| *	Fix upload tests, reformat code and make rubocop happy	Kamil Trzcinski	2015-11-20	2	-122/+110
\| \|
\| *	Part of tests done [ci skip]	Kamil Trzcinski	2015-11-20	2	-104/+338
\| \|
\| *	Add support for batch download operation	Kamil Trzcinski	2015-11-20	3	-36/+96
\| \|
* \|	Merge branch 'lfs_on_by_default_and_backup' into '8-2-stable'	Dmitriy Zaporozhets	2015-11-20	7	-9/+47
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Lfs on by default and backup See merge request !1852
\| *	Add lfs to backup specs.	Marin Jankovski	2015-11-20	1	-5/+9
\| \|
\| *	Backup LFS objects same as any upload.	Marin Jankovski	2015-11-20	4	-2/+36
\| \|
\| *	Lfs on by default.	Marin Jankovski	2015-11-20	2	-2/+2
\| \|
* \|	Merge branch 'notes_fix_to_stable' into '8-2-stable'	Valery Sizov	2015-11-20	4	-4/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for Emoji (to stable) See merge request !1850
\| * \|	Fix for Emoji	Valery Sizov	2015-11-20	4	-4/+6
\| \|/
* \|	Merge branch 'merge-1790-to-8-2-stable' into '8-2-stable'	Yorick Peterse	2015-11-20	31	-215/+700
\|\ \ \| \| \| \| \| \|	See merge request !1851
\| * \|	Merge branch 'atom-feed-latest-update' into 'master'	Yorick Peterse	2015-11-20	31	-215/+700
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \|	Update LFS docs for cloning [ci skip]	Robert Schilling	2015-11-20	1	-3/+2
\| \|
* \|	Fix huge line height for diff files list	Dmitriy Zaporozhets	2015-11-20	1	-0/+1
\|/ \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'rs-mr-reference-copy' into 'master'	Robert Speicher	2015-11-19	1	-2/+4
\| \| \| \| \|	Add clipboard button to merge request cross-project reference See merge request !1847
*	Merge branch 'emoji_votes' into 'master'	Dmitriy Zaporozhets	2015-11-19	33	-438/+431
\| \| \| \| \| \| \| \| \| \|	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 ":+1:" and any other. You can post not only emoji that listed in the emoji picker. See merge request !1825
*	Merge branch 'ci-yaml-validation' into 'master'	Kamil Trzciński	2015-11-19	6	-22/+36
\| \| \| \| \| \| \| \| \| \| \| \| \|	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
*	Merge branch 'rs-safari-clipboard-fallback' into 'master'	Robert Speicher	2015-11-19	1	-5/+16
\| \| \| \| \| \| \| \| \|	Add a fallback for Safari copy-to-clipboard Also, hide the tooltip in a less stupid way. Closes #3547 See merge request !1844
*	Merge branch 'dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow' ↵	Robert Speicher	2015-11-19	5	-23/+199
\| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Improve personal snippet access workflow. Replaces !1709 Fixes #3258 See merge request !1817
*	Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master'	Robert Speicher	2015-11-19	19	-144/+184
\| \| \| \| \| \| \| \| \|	Add option to create merge request when editing/creating a file Replaces !1611 Fixes #3059 See merge request !1820
*	Merge branch 'new-tag-textarea' into 'master'	Robert Speicher	2015-11-19	3	-16/+9
\| \| \| \| \| \| \|	Fix 'Attach a file' link in new tag form Also removed a little bit of code repetition :) See merge request !1834
*	Merge branch 'update-gitlab-shell-doc' into 'master'	Robert Speicher	2015-11-19	2	-2/+2
\| \| \| \| \| \| \|	Update gitlab-shell documentation to 2.6.7 See merge request !1836
*	Merge branch 'lfs-client-doc' into 'master'	Job van der Voort	2015-11-19	1	-1/+1
\| \| \| \| \| \| \|	Add link to git-lfs client [ci skip] See merge request !1832
*	Merge branch 'check_if_it_should_be_archived_in_backup' into 'master'	Dmitriy Zaporozhets	2015-11-19	2	-9/+8
\| \| \| \| \| \| \| \| \| \|	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
*	Merge branch 'add_lfs_doc' into 'master'	Job van der Voort	2015-11-19	1	-0/+136
\| \| \| \| \| \| \|	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
*	Merge branch 'update_nginx_deploy' into 'master'	Dmitriy Zaporozhets	2015-11-19	2	-2/+2
\| \| \| \| \| \| \| \| \|	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
*	Merge branch 'client-max-body-size' into 'master'	Robert Speicher	2015-11-19	2	-6/+2
\| \| \| \| \| \| \|	Do not limit workhorse POST/PUT size in NGINX Limiting, if any, should happen in gitlab-workhorse. See merge request !1831