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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix deprecation messages in tests	Valery Sizov	2015-12-03	1	-1/+1
\|
*	Merge branch 'upload_hook' into 'master'	Valery Sizov	2015-11-30	1	-0/+17
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fire update hook from GitLab https://gitlab.com/gitlab-org/gitlab-ce/issues/3069 See merge request !1882
\| *	Fire update hook from GitLab	Valery Sizov	2015-11-30	1	-0/+17
\| \|
* \|	Merge branch 'rails_update_to_4_2' into 'master'	Valery Sizov	2015-11-30	4	-5/+4
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
\| *	fix specsrails_update_to_4_2	Valery Sizov	2015-11-30	2	-2/+2
\| \|
\| *	Migrate mailers to ActiveJob	Valery Sizov	2015-11-26	2	-3/+2
\| \|
* \|	Fix alignment	Robert Speicher	2015-11-27	1	-6/+6
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Fix indentation in NGINX confignginx-workhorse-upload-limit	Jacob Vosmaer	2015-11-27	1	-6/+6
\| \|
* \|	Repeat "client_max_body_size 0" everywhere	Jacob Vosmaer	2015-11-27	2	-0/+12
\|/ \| \| \| \|	It turns out that if we do not the declaration from "location /" wins.
*	Merge branch 'sherlock-total-query-time' into 'master'	Yorick Peterse	2015-11-25	1	-0/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added total query time to Sherlock This makes it easier to see if a problem is caused by slow queries or slow Ruby code (unrelated to any SQL queries that might be used). See merge request !1887
\| *	Added total query time to Sherlocksherlock-total-query-time	Yorick Peterse	2015-11-24	1	-0/+5
\| \| \| \| \| \| \| \| \| \|	This makes it easier to see if a problem is caused by slow queries or slow Ruby code (unrelated to any SQL queries that might be used).
* \|	Remove usage of Coloredrs-update-colorize	Robert Speicher	2015-11-24	1	-11/+1
\|/
*	Merge branch 'ci-artifacts-path' into 'master'	Robert Speicher	2015-11-23	2	-1/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose artifacts path This fixes broken artifacts storage path. Fixes #3607 Fixes #3608 Related: gitlab-org/omnibus-gitlab!544 See merge request !1869
\| *	Expose artifacts pathci-artifacts-path	Kamil Trzcinski	2015-11-23	2	-1/+3
\| \|
* \|	Merge branch 'required_version_and_docs_update' into 'master'	Dmitriy Zaporozhets	2015-11-23	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Update required version of lfs client and separate the docs for users and admins. See merge request !1855
\| *	Update required version of lfs client and separate the docs for users and ↵required_version_and_docs_update	Marin Jankovski	2015-11-20	1	-1/+1
\| \| \| \| \| \| \| \|	admins.
* \|	Merge branch 'fix-award-emoji-api' into 'master'	Robert Speicher	2015-11-22	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-api	Robert Schilling	2015-11-21	1	-0/+5
\| \|/ \| \| \| \| \| \|	compatibility
* \|	Allow editing a release in API via PUT method	Robert Schilling	2015-11-21	1	-0/+21
\| \|
* \|	Only allow to create a release if it does not exist yet	Robert Schilling	2015-11-21	1	-2/+2
\| \|
* \|	Use POST to create a new release instead of PUT	Robert Schilling	2015-11-21	1	-1/+1
\| \|
* \|	API: Return 404 if the tag for a release does not exist	Robert Schilling	2015-11-21	1	-3/+7
\| \|
* \|	Make tag API consistent for release feature	Robert Schilling	2015-11-21	2	-5/+6
\|/
*	Merge branch 'lfs-batch-download' into 'master'	Marin Jankovski	2015-11-20	2	-68/+89
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 Jankovski	2015-11-20	2	-49/+15
\| \|
\| *	Fix upload tests, reformat code and make rubocop happy	Kamil Trzcinski	2015-11-20	1	-2/+1
\| \|
\| *	Part of tests done [ci skip]	Kamil Trzcinski	2015-11-20	1	-11/+16
\| \|
\| *	Add support for batch download operationlfs-batch-download	Kamil Trzcinski	2015-11-19	2	-28/+79
\| \|
* \|	Merge branch 'lfs_default_and_backup' into 'master'	Dmitriy Zaporozhets	2015-11-20	3	-1/+35
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lfs default and backup Part of gitlab-org/gitlab-ce#2955 See merge request !1823
\| * \|	Backup LFS objects same as any upload.	Marin Jankovski	2015-11-19	3	-1/+35
\| \| \|
* \| \|	Merge branch 'emoji_votes' into 'master'	Dmitriy Zaporozhets	2015-11-19	2	-3/+13
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	satisfy rubocop	Valery Sizov	2015-11-19	1	-3/+5
\| \| \|
\| * \|	Emoji: fix image of emoji when it is submitted via comment	Valery Sizov	2015-11-19	1	-0/+4
\| \| \|
\| * \|	Emoji: refactoring	Valery Sizov	2015-11-19	1	-0/+6
\| \| \|
\| * \|	award emoji	Valery Sizov	2015-11-19	1	-3/+1
\| \| \|
* \| \|	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
\| * \| \|	Do not limit workhorse POST/PUT size in NGINX	Jacob Vosmaer	2015-11-19	2	-6/+2
\| \|/ / \| \| \| \| \| \| \| \| \|	Limiting, if any, should happen in gitlab-workhorse.
* \| \|	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
\| * \| \|	Deploy page should be shown for all pages not just root	Drew Blessing	2015-11-18	2	-2/+2
\| \|/ /
* \| \|	Merge branch 'atom-feed-latest-update' into 'master'	Yorick Peterse	2015-11-19	1	-0/+34
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Fix UNION syntax for MySQL	Yorick Peterse	2015-11-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apparently MySQL doesn't support this syntax: (...) UNION (...) instead it only supports: ... UNION ...
\| * \| \|	Added Gitlab::SQL::Union class	Yorick Peterse	2015-11-18	1	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This class can be used to join multiple AcitveRecord::Relation objects together using a SQL UNION statement. ActiveRecord < 5.0 sadly doesn't support UNION and existing Gems out there don't handle prepared statements (e.g. they never incremented the variable bindings).
* \| \| \|	Merge branch 'check_if_it_should_be_archived_in_backup' into 'master'	Dmitriy Zaporozhets	2015-11-19	1	-8/+6
\|\ \ \ \ \| \|_\|/ / \|/\| \| / \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	USe reject.check_if_it_should_be_archived_in_backup	Marin Jankovski	2015-11-18	1	-1/+1
\| \| \|
\| * \|	Check which folders and archives should be packed before passing to tar command.	Marin Jankovski	2015-11-18	1	-8/+6
\| \|/
* \|	Merge branch 'ce-mirror-backport' into 'master'	Douwe Maan	2015-11-18	1	-3/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport relevant changes from gitlab-org/gitlab-ee!51 To do: - [x] Update gitlab-shell See merge request !1822
\| * \|	Store and show reason why import failed.	Douwe Maan	2015-11-18	1	-3/+4
\| \|/
* \|	Merge pull request #9838 from evindor/master	Douwe Maan	2015-11-18	1	-1/+1
\|\ \ \| \|/ \|/\|	Fix github importer to handle empty issues
\| *	Fix github importer to handle empty issues	Arseny Zarechnev	2015-11-18	1	-1/+1
\| \|
* \|	Remove small code duplication in user_reference_filter.rb	Dmitriy Zaporozhets	2015-11-17	1	-6/+9
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>