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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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	6	-30/+48
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-30/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \|	Merge branch '31500-fix-rspec_profiling-reporting' into 'master'	Robert Speicher	2017-04-28	4	-11/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "rspec_profiling is enabled for MySQL" See merge request !10967
\| * \|	Resolve "rspec_profiling is enabled for MySQL"	Rémy Coutable	2017-04-28	4	-11/+10
\|/ /
* \|	Merge branch 'enable-spec-file-name-cop' into 'master'	Robert Speicher	2017-04-28	36	-591/+348
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable RSpec/FilePath cop Closes #31316 See merge request !10911
\| * \|	Enable RSpec/FilePath copenable-spec-file-name-cop	Sean McGivern	2017-04-26	36	-591/+348
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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	18	-39/+26
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pull preserve into render helpers See merge request !10986
\| * \| \|	Pull preserve into render helpers	Douwe Maan	2017-04-28	18	-39/+26
\| \| \| \|
* \| \| \|	Merge branch 'grpc-1.2.5' into 'master'	Robert Speicher	2017-04-28	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use grpc 1.2.5 Closes #31143 and gitaly#197 See merge request !10984
\| * \| \| \|	Use grpc 1.2.5	Jacob Vosmaer	2017-04-28	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dm-video-viewer' into 'master'	Sean McGivern	2017-04-28	5	-2/+24
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add video blob viewer See merge request !10749
\| * \| \| \| \|	Display video blobs in-line like imagesdm-video-viewer	Douwe Maan	2017-04-28	5	-2/+24
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	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	2	-2/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-2/+9
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	8	-9/+157
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	8	-9/+157
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'zj-accept-default-branch-param' into 'master'	Douwe Maan	2017-04-28	3	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Accept default branch param on notifaction services Closes #31173 See merge request !10959
\| * \| \| \| \| \|	Accept default branch param on notifaction services	Zeger-Jan van de Weg	2017-04-28	3	-1/+6
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'fix-sidebar-block-ref-test' into 'master'	Sean McGivern	2017-04-28	2	-5/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-5/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'pages-0.4.1' into 'master'	Kamil Trzciński	2017-04-28	2	-1/+5
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use GitLab Pages v0.4.1 See merge request !10891
\| * \| \| \| \| \|	Use GitLab Pages v0.4.1	Nick Thomas	2017-04-25	2	-1/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2	Sean McGivern	2017-04-28	5	-1/+115
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unicorn worker termination tests See merge request !10818
\| * \| \| \| \| \| \|	Remove config lines in one place	Jacob Vosmaer	2017-04-28	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use rspec 'be'	Jacob Vosmaer	2017-04-28	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Refactor timeout code	Jacob Vosmaer	2017-04-28	1	-8/+17
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add test that asserts unicorns terminate	Jacob Vosmaer	2017-04-26	5	-1/+106
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs/make-ci-run-only-for-doc-changes' into 'master'	Achilleas Pipinellis	2017-04-28	2	-0/+51
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip irrelevant jobs for documentation only changes Closes #30853 See merge request !10961
\| * \| \| \| \| \| \|	Document the process of docs only changesdocs/make-ci-run-only-for-doc-changes	Achilleas Pipinellis	2017-04-28	2	-3/+28
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Skip irrelevant jobs for documentation only changes	Achilleas Pipinellis	2017-04-28	1	-0/+26
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '31549-check-duplicates-first' into 'master'	Sean McGivern	2017-04-28	2	-0/+31
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add notice at the beginning of issue templates asking reporters to check for duplicates first Closes #31549 See merge request !10978
\| * \| \| \| \| \| \| \|	Add notice at the beginning of issue templates asking reporters to check for ↵	Rémy Coutable	2017-04-28	2	-0/+31
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	duplicates first [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch '28457-slash-command-board-move' into 'master'	Sean McGivern	2017-04-28	6	-9/+107
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add board_move slash command Closes #28457 See merge request !10433
\| * \| \| \| \| \| \| \|	Add board_move slash command	Alex Sanford	2017-04-28	6	-9/+107
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'add_index_on_ci_runners_contacted_at' into 'master'	Yorick Peterse	2017-04-28	3	-1/+25
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index on ci_runners.contacted_at Closes #31229 See merge request !10876
\| * \| \| \| \| \| \|	Add index on ci_runners.contacted_at	blackst0ne	2017-04-28	3	-1/+25
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'improve-slack-docs' into 'master'	Sean McGivern	2017-04-28	4	-66/+40
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve Slack docs See merge request !10927
\| * \| \| \| \| \| \| \|	Improve Slack docs	Victor Wu	2017-04-28	4	-66/+40
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2017-04-28	10	-20/+496
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'29181-add-more-tests-for-spec-controllers-projects-builds-controller-spec-rb' into 'master' Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb" Closes #29181 See merge request !10244
\| * \| \| \| \| \| \| \|	Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"	Dosuken shinya	2017-04-28	10	-20/+496
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'make_markdown_tables_thinner' into 'master'	Sean McGivern	2017-04-28	5	-0/+25
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make markdown tables thinner Closes #14123 See merge request !10909
\| * \| \| \| \| \| \| \|	Make markdown tables thinner	blackst0ne	2017-04-27	5	-0/+25
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'project-list-alignment' into 'master'	Phil Hughes	2017-04-28	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove top padding on project list row See merge request !10939
\| * \| \| \| \| \| \| \| \|	Remove top padding on project list rowproject-list-alignment	Annabel Dunstone Gray	2017-04-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'dm-blob-viewers' into 'master'	Tim Zallmann	2017-04-28	71	-297/+1773
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor rich blob viewers and add Code\|Rendered switch Closes #24287 See merge request !10566
\| * \| \| \| \| \| \| \| \|	Use new renamed markup methoddm-blob-viewers	Douwe Maan	2017-04-27	2	-1/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add variable to save us a double lookup	Douwe Maan	2017-04-27	1	-2/+3
\| \| \| \| \| \| \| \| \| \|