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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'zj-fix-coverage-bug' into 'master'	Kamil Trzciński	2017-04-12	2	-7/+19
\|\ \| \| \| \| \| \| \| \|	Return nil as coverage instead of a File object See merge request !10633
\| *	Return nil as coverage instead of a File objectzj-fix-coverage-bug	Z.J. van de Weg	2017-04-12	2	-7/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Given a valid pipeline job, and a regex which wouldn't match to a jobs trace, the stream of the trace would return the File object. This was not the case when it matched a value, as that would have been return from the block. Now the `extract_coverage` method returns `nil` if no match was found.
* \|	Merge branch 'zj-api-fix-build-events' into 'master'	Rémy Coutable	2017-04-12	1	-4/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Api fix build events rename to Job events Closes #30412 See merge request !10586
\| * \|	Fix API not accepting job_events for webhookszj-api-fix-build-events	Z.J. van de Weg	2017-04-12	1	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When renaming, the argument on the projects hook API was forgotten. Now one could successfully set it again. The fix is a little ugly stylewise, but needed as the underlying model still refers to it as build_events. This commit is to fix it, later we should migrate the data to a new column. The edit on the spec file makes sure it passes now, and will fail when we migrate the column.
* \| \|	Merge branch 'siemens/gitlab-ce-fix/subgroup-hide-button' into 'master'	Rémy Coutable	2017-04-12	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide new subgroup button if user has no permission to create one Closes #30139 See merge request !10627
\| * \| \|	Move permission to create subgroup into GroupPolicy	Dmitriy Zaporozhets	2017-04-11	2	-23/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	fix(subgroups): add verification of group creation capability to subgroup UI	Fabio Huser	2017-03-30	1	-0/+22
\| \| \| \|
* \| \| \|	Merge branch 'gitaly-testing' into 'master'	Rémy Coutable	2017-04-12	7	-93/+138
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Setup and run a Gitaly server for testing if GitalyClient is enabled See merge request !10298
\| * \| \| \|	Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testing	Alejandro Rodríguez	2017-04-11	7	-93/+138
\| \| \| \| \|
* \| \| \| \|	Merge branch '30457-expire-note-destroy' into 'master'	Sean McGivern	2017-04-12	1	-1/+11
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue's note cache expiration after delete Closes #30457 See merge request !10461
\| * \| \| \|	Fix issue's note cache expiration after delete	mhasbini	2017-04-11	1	-1/+11
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dm-outdated-diff-link' into 'master'	Sean McGivern	2017-04-11	4	-3/+87
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572
\| * \| \| \| \|	Add specs	Douwe Maan	2017-04-10	4	-2/+86
\| \| \| \| \| \|
\| * \| \| \| \|	Some code tweaks	Douwe Maan	2017-04-08	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix specs and make tweaks	Douwe Maan	2017-04-08	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '28017-separate-ce-params-on-api' into 'master'	Douwe Maan	2017-04-11	1	-0/+7
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "API: Separate CE params to avoid wrong conflict resolutions" Closes #28017 See merge request !10484
\| * \| \| \| \|	Separate CE params on Grape API	Oswaldo Ferreira	2017-04-10	1	-0/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-remove-open-for-scope' into 'master' test-branch-name	Douwe Maan	2017-04-11	1	-9/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused scopes See merge request !10609
\| * \| \| \| \| \|	Remove an unused `Issue.open_for` scope	Robert Speicher	2017-04-10	1	-9/+0
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'dz-fix-project-view' into 'master'	Annabel Dunstone Gray	2017-04-11	2	-2/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change project view default for existing users and anonymous visitors to files+readme Closes #29926 See merge request !10498
\| * \| \| \| \| \|	Change project view default for existing users and anonymous visitors to ↵dz-fix-project-view	Dmitriy Zaporozhets	2017-04-10	2	-2/+19
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	files+readme Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'signed-out-menu-shortcuts' into 'master'	Jacob Schatz	2017-04-11	1	-13/+35
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added keyboard shortcuts to signed out menu See merge request !10526
\| * \| \| \| \| \|	Added keyboard shortcuts to signed out menusigned-out-menu-shortcuts	Phil Hughes	2017-04-10	1	-13/+35
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'mr-widget-bug-fix' into 'master'	Stan Hu	2017-04-11	1	-0/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the MR widget that merged any MR when choosing the option "Merge when pipeline succeeds" from the dropdown Closes #29568 See merge request !10611
\| * \| \| \| \| \| \|	Added tests and fixed a typo	Jose Ivan Vargas	2017-04-10	1	-0/+13
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master'	Kamil Trzciński	2017-04-11	3	-20/+78
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix container repository/tag location text copied into the clipboard Closes #30695 See merge request !10587
\| * \| \| \| \| \| \|	Add container registry repositories view specsfix/gb/improve-container-registry-clipboard-links	Grzegorz Bizon	2017-04-10	1	-0/+36
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add method that returns location of registry image	Grzegorz Bizon	2017-04-10	1	-0/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Improve test examples for container repository class	Grzegorz Bizon	2017-04-10	1	-21/+21
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add method that returns a registry repository location	Grzegorz Bizon	2017-04-10	1	-0/+15
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix_cache_expiration_in_repository' into 'master'	Robert Speicher	2017-04-10	1	-2/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix redundant cache expiration in Repository Closes #30146 See merge request !10575
\| * \| \| \| \| \| \|	Fix redundant cache expiration in Repository	blackst0ne	2017-04-10	1	-2/+0
\| \|/ / / / / /
* \| \| \| \| \| \|	Don't show 'Copy content' button on text files that are not rendered as text	Douwe Maan	2017-04-10	1	-5/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '1595-ee-backport-environments-tests' into 'master'	Clement Ho	2017-04-10	2	-4/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of EE changes in environments tests See merge request !10528
\| * \| \| \| \| \|	Backport of EE changes in environments tests1595-ee-backport-environments-tests	Filipa Lacerda	2017-04-07	2	-4/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'backport-ee-1525' into 'master'	Robert Speicher	2017-04-10	4	-50/+195
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport Git-env code from EE "Fix push rules on Git 2.11" (gitlab-org/gitlab-ee!1525) See merge request !10547
\| * \| \| \| \| \| \|	Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs method	Rémy Coutable	2017-04-10	1	-48/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Retrieve Git-specific env in Gitlab::Git::Repository#rugged	Rémy Coutable	2017-04-10	1	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Set Git-specific env in /api/internal/allowed	Rémy Coutable	2017-04-10	1	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Add a Gitlab::Git::Env to store Git-specific env thread-safely	Rémy Coutable	2017-04-10	1	-0/+102
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'add-vue-loader' into 'master'	Filipa Lacerda	2017-04-10	3	-3/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add vue loader Closes #29519 See merge request !10517
\| * \| \| \| \| \|	convert pipeline async_button component to vue template	Mike Greiling	2017-04-09	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	convert pipeline error state to vue template	Mike Greiling	2017-04-09	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	convert pipeline empty state to vue template	Mike Greiling	2017-04-09	1	-1/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'ci-favicon-back-in' into 'master'	Filipa Lacerda	2017-04-10	1	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added back in the CI status favicon See merge request !10534
\| * \| \| \| \| \|	Fixed karmaci-favicon-back-in	Phil Hughes	2017-04-10	1	-3/+3
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'spec_for_schema' into 'master'	Rémy Coutable	2017-04-10	1	-0/+23
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec for schema.rb Closes #21978 See merge request !10580
\| * \| \| \| \|	Add spec for schema.rb	blackst0ne	2017-04-10	1	-0/+23
\| \|/ / / /
* \| \| \| \|	Merge branch 'test-all-etag-routes' into 'master'	Sean McGivern	2017-04-10	1	-0/+83
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test all enabled routes in ETag caching middleware and fix pipeline routes Closes #30563 See merge request !10535
\| * \| \| \| \|	Test all enabled routes in ETag caching middleware and fix pipeline routestest-all-etag-routes	Adam Niedzielski	2017-04-10	1	-0/+83
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract route matching logic to Gitlab::EtagCaching::Router. Fix pipeline routes: 1. "project_pipelines" has to come after "commit_pipelines" and "merge_request_pipelines" because it is more generic 2. "commit_pipelines": "\s" (any whitespace character) => "\S" (any non-whitespace character).