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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed view specscommit-limited-container-width	Phil Hughes	2017-05-02	1	-2/+1
\|
*	Merge branch 'master' into commit-limited-container-width	Phil Hughes	2017-05-02	11	-15/+234
\|\
\| *	Merge branch 'pdf-test-fix' into 'master'	Sean McGivern	2017-05-02	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed PDF blob specs See merge request !11025
\| \| *	Fixed PDF blob specs	Phil Hughes	2017-05-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	The PDF file is no longer included in the repo, so we need to create the PDF before running the tests
\| * \|	Merge branch '19364-webhook-edit' into 'master'	Dmitriy Zaporozhets	2017-05-02	5	-13/+146
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement ability to update hooks Closes #19364 See merge request !10816
\| \| * \|	Implement ability to update hooks	Alexander Randa	2017-04-28	5	-13/+146
\| \| \| \|
\| * \| \|	Merge branch '26488-target-disabled-mr' into 'master'	Sean McGivern	2017-05-02	4	-1/+81
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 404 when upstream disabled merge requests Closes #26488 See merge request !10427
\| \| * \| \|	Fix 404 when upstream has disabled merge requests	mhasbini	2017-04-27	4	-1/+81
\| \| \| \| \|
\| * \| \| \|	Merge branch 'add-tanuki-ci-status-favicons' into 'master'	Sean McGivern	2017-05-02	1	-0/+6
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updated to new favicons Closes #12818 See merge request !10923
\| \| * \| \|	Added test	Luke "Jared" Bennett	2017-04-25	1	-0/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into commit-limited-container-width	Phil Hughes	2017-05-02	319	-1497/+4998
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Better Explore Groups view	Luke "Jared" Bennett	2017-05-02	3	-4/+185
\| \| \| \| \|
\| * \| \| \|	Merge branch 'pdflab-in-repo' into 'master'	Phil Hughes	2017-05-02	9	-8/+149
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move PDFLab assets into repo See merge request !10642
\| \| * \| \| \|	Move PDFLab into GitLabpdflab-in-repo	Sam Rose	2017-04-28	9	-8/+149
\| \| \| \| \| \|
\| * \| \| \| \|	Update Carrierwave and fog-core	Zeger-Jan van de Weg	2017-05-01	3	-11/+14
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'fix/add-specs-for-request-profiler' into 'master'	Douwe Maan	2017-05-01	3	-0/+140
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add specs for Gitlab::RequestProfiler Closes #31513 See merge request !11005
\| \| * \| \| \| \|	Add specs for Gitlab::RequestProfiler	Ahmad Sherif	2017-05-01	3	-0/+140
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31513
\| * \| \| \| \| \|	Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master'	Douwe Maan	2017-05-01	1	-1/+9
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't blow up when email has no References header Closes gitlab-ee#2247 See merge request !11014
\| \| * \| \| \| \| \|	Don't blow up when email has no References headerdont-blow-up-when-email-has-no-references-header	Sean McGivern	2017-05-01	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If an email doesn't match our incoming email patterns on the To header, we fall back to the References header. If there was no References header, we'd raise an exception, when we'd be better off acting as if it was empty.
\| * \| \| \| \| \| \|	Merge branch 'dm-blob-download-button' into 'master'	Sean McGivern	2017-05-01	1	-0/+24
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show Raw button as Download for binary files See merge request !10743
\| \| * \| \| \| \| \| \|	Show Raw button as Download for binary files	Douwe Maan	2017-04-30	1	-0/+24
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-05-01	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'28968-revert-allow-people-with-merge-access-to-create-branches' into 'master' Prevent people from creating branches if they don't have persmission to push Closes #28968 See merge request !10983
\| \| * \| \| \| \| \| \| \|	Prevent people from creating branches if they don't have persmission to push	Pawel Chojnacki	2017-04-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'dm-snippet-blob-viewers' into 'master'	Sean McGivern	2017-05-01	10	-14/+332
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use blob viewers for snippets See merge request !10747
\| \| * \| \| \| \| \| \| \|	Use blob viewers for snippets	Douwe Maan	2017-04-30	10	-14/+332
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '30586-fix-gitaly-is-ancestor' into 'master' 31611-sketch43-click-opens-new-tab-and-closes-it-quickly	Sean McGivern	2017-05-01	1	-13/+11
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Gitaly::Commit#is_ancestor Closes #30586 See merge request !10634
\| \| * \| \| \| \| \| \| \| \|	Fix Gitaly::Commit#is_ancestor30586-fix-gitaly-is-ancestor	Kim "BKC" Carlbäcker	2017-04-28	1	-13/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Upgrade Gitaly-version
\| * \| \| \| \| \| \| \| \| \|	Merge branch '31615-fix-dropdown-animation-failure' into 'master'	Jacob Schatz	2017-05-01	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed transient failure related to dropdown animations Closes #31615 See merge request !11002
\| \| * \| \| \| \| \| \| \| \|	Fixed transient failure related to dropdown animations31615-fix-dropdown-animation-failure	Luke "Jared" Bennett	2017-04-30	1	-0/+1
\| \| \| \|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'rs-add_column_with_default_cops' into 'master'	Sean McGivern	2017-05-01	2	-2/+46
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cop to blacklist specific tables for `add_column_with_default` Closes #31293 See merge request !10892
\| \| * \| \| \| \| \| \| \|	Add AddColumnWithDefaultToLargeTable cop	Robert Speicher	2017-04-28	1	-0/+44
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Rename AddColumnWithDefault to ReversibleAddColumnWithDefault	Robert Speicher	2017-04-28	1	-2/+2
\| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're going to add another cop that deals with another aspect of `add_column_with_default`, so we need to separate them.
\| * \| \| \| \| \| \| \|	Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465ac	Stan Hu	2017-04-29	1	-31/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !10845
\| * \| \| \| \| \| \| \|	Another change from .click -> .trigger('click') to make spec pass	Stan Hu	2017-04-28	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Change from .click -> .trigger('click') to make spec passrs-trigger-click	Robert Speicher	2017-04-28	1	-1/+1
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'tc-no-todo-service-select' into 'master'	Robert Speicher	2017-04-28	1	-17/+31
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid plucking Todo ids in TodoService Closes #30374 See merge request !10845
\| \| * \| \| \| \| \| \|	Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-select	Toon Claes	2017-04-27	1	-17/+31
\| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	TodoService should not call `.select(&:id)` on todos, because this is bad performance. So instead use sub-queries, which will result in a single SQL query to the database. https://docs.gitlab.com/ee/development/sql.html#plucking-ids
\| * \| \| \| \| \| \|	Resolve "rspec_profiling is enabled for MySQL"	Rémy Coutable	2017-04-28	1	-2/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'enable-spec-file-name-cop' into 'master'	Robert Speicher	2017-04-28	35	-587/+342
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable RSpec/FilePath cop Closes #31316 See merge request !10911
\| \| * \| \| \| \| \| \|	Enable RSpec/FilePath copenable-spec-file-name-cop	Sean McGivern	2017-04-26	35	-587/+342
\| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Ignore JS fixtures - Ignore qa directory - Rewrite concern specs to put concern name first
\| * \| \| \| \| \| \|	Merge branch 'dm-pull-preserve-into-render-helpers' into 'master'	Sean McGivern	2017-04-28	2	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pull preserve into render helpers See merge request !10986
\| \| * \| \| \| \| \| \|	Pull preserve into render helpers	Douwe Maan	2017-04-28	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'dz-add-oauth-controller-spec' into 'master'	Rémy Coutable	2017-04-28	1	-0/+55
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tests for Oauth::AuthorizationsController See merge request !10982
\| \| * \| \| \| \| \| \| \|	Add tests for Oauth::AuthorizationsControllerdz-add-oauth-controller-spec	Dmitriy Zaporozhets	2017-04-28	1	-0/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Merge branch 'dz-improve-add-users-method' into 'master'	Douwe Maan	2017-04-28	1	-2/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Collect all users by single query when using Member#add_users See merge request !10975
\| \| * \| \| \| \| \| \| \| \|	Collect all users by single query when using Member#add_usersdz-improve-add-users-method	Dmitriy Zaporozhets	2017-04-28	1	-2/+4
\| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Merge branch '28020-improve-todo-list-when-comes-from-yourself' into 'master'	Sean McGivern	2017-04-28	3	-2/+125
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve text on todo list when the todo action comes from yourself Closes #28020 See merge request !10594
\| \| * \| \| \| \| \| \| \|	Improve text on todo list when the todo action comes from yourself	Jacopo	2017-04-28	3	-2/+125
\| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved todo message when an issue is assigned to yourself. - The new message when an user assign to himself an issue or a mr is: "You assigned issue xx to yourself" - The new message when an user adds a todo to himself is: "You added a todo for issue xx" - The new message when and user mention himself is: "You mentioned yourself on issue xx" - The new message when an user directly address himself is: "You directly addressed yourself on issue xx" - The new message when an user mark himself as an approver is: "You set yourself as an approver for merge request xx"
\| * \| \| \| \| \| \| \|	Merge branch 'fix-sidebar-block-ref-test' into 'master'	Sean McGivern	2017-04-28	1	-3/+2
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add issues and merge-requests classes and use to find in rspec See merge request !10980
\| \| * \| \| \| \| \| \|	add issues and merge-requests classes and use to find in rspecfix-sidebar-block-ref-test	Luke "Jared" Bennett	2017-04-28	1	-3/+2
\| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|