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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add User#nested_groups and User#nested_projects methodsdz-nested-groups-access-improvements	Dmitriy Zaporozhets	2017-01-24	6	-2/+71
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Refactor Namespace code related to nested groups	Dmitriy Zaporozhets	2017-01-13	6	-13/+47
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'fix-ruby21-milestone-api-specs' into 'master'	Sean McGivern	2017-01-13	1	-3/+5
\|\ \| \| \| \| \| \| \| \|	Fix milestone API specs in Ruby 2.1 See merge request !8555
\| *	Put .gitlab-ci.yml back to only 2.1 on master	Sean McGivern	2017-01-13	1	-0/+5
\| \| \| \| \| \| \| \|	[ci skip]
\| *	Only escape the 'No Milestone' paramfix-ruby21-milestone-api-specs-2	Sean McGivern	2017-01-13	2	-4/+6
\| \| \| \| \| \| \| \|	This is less invasive than the parent commit.
\| *	Fix milestone API specs in Ruby 2.1fix-ruby21-milestone-api-specs	Sean McGivern	2017-01-13	2	-6/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ruby 2.3: ``` URI.parse('http://foo/bar?baz quux') => #<URI::HTTP http://foo/bar?baz%20quux> ``` Ruby 2.1: ``` URI.parse('http://foo/bar?baz quux') URI::InvalidURIError: bad URI(is not URI?): http://foo/bar?baz quux ```
* \|	Merge branch 'fix/git-migration' into 'master'	Sean McGivern	2017-01-13	1	-4/+11
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Add check for new path existence Closes #26641 See merge request !8554
\| *	Add check for new path existence	James Lopez	2017-01-13	1	-4/+11
\| \|
* \|	Merge branch 'clipboard-button-text' into 'master'	Sean McGivern	2017-01-13	5	-7/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Copy <some text> to clipboard See merge request !8535
\| * \|	Text for copy to clipboard: URL, personal access token, commands, referenceclipboard-button-text	victorwu	2017-01-12	5	-7/+10
\| \| \|
* \| \|	Merge branch '23194-fix-no-milestone-option-for-projects-endpoint' into ↵	Sean McGivern	2017-01-13	4	-24/+112
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fixes the incoherent filtering by milestone in `/projects/:id/issues` and `/groups/:id/issues` endpoints Closes #23194 See merge request !8457
\| * \|	API: Implement project issues iid param with IssuesFinder and add tests23194-fix-no-milestone-option-for-projects-endpoint	David Eisner	2017-01-12	4	-24/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Use IssuesFinder for the /issues API resouce - Tests for iid filter in project issues API resource - Tests for No Milestone filter in issues API resources The "No Milestone" case was not previously tested, and the `/issues` resource did not support the the `milestone` parameter. - Return issues where all labels match from the issues and project issues API resources, like the group issues resource already does. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6825#note_17474533 Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Adding 'IssueFinder' for 'projects' API endpoint	Panagiotis Atmatzidis	2017-01-12	1	-6/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Current filtering for "/projects/:id/issues" endpoint returns no results for "No Milestone" query. This PR introduces fix by copying filtering from "/groups/:id/issues" which works as expected.
* \| \|	Merge branch '26627-update-gitlab-markup-to-1-5-1-again' into 'master'	Robert Speicher	2017-01-13	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-markup back to 1.5.1 in Gemfile Closes #26627 See merge request !8550
\| * \| \|	Update gitlab-markup back to 1.5.1 in Gemfile26627-update-gitlab-markup-to-1-5-1-again	Rémy Coutable	2017-01-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'move-dashboard-help-spinach-to-rspec' into 'master'	Rémy Coutable	2017-01-13	3	-30/+17
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move dashboard help spinach test to rspec See merge request !8436
\| * \| \| \|	Move dashboard help spinach test to rspec	Semyon Pupkov	2017-01-04	3	-30/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \|	Merge branch 'move-dashboard-group-spinach-to-rspec' into 'master'	Rémy Coutable	2017-01-13	3	-38/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move dashboard group spinach test to rspec See merge request !8434
\| * \| \| \| \|	Move dashboard group spinach test to rspec	Semyon Pupkov	2017-01-04	3	-38/+20
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \|	Merge branch 'move-dashboard-archived-projects-spinach-to-rspec' into 'master'	Rémy Coutable	2017-01-13	4	-43/+32
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move dashboard archived projects spinach tests to rspec See merge request !8431
\| * \| \| \| \|	Move dashboard archived projects spinach tests to rspec	Semyon Pupkov	2017-01-04	4	-43/+32
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \|	Merge branch 'move-dashboard-activetab-spinach-to-rspec' into 'master'	Rémy Coutable	2017-01-13	3	-29/+46
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move dashboard active tab spinach test to rspec See merge request !8423
\| * \| \| \| \|	Move dashboard active tab spinach test to rspec	Semyon Pupkov	2017-01-03	3	-29/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \| \|	Merge branch 'remove-double-let' into 'master'	Rémy Coutable	2017-01-13	1	-1/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate let in cycle_analytics_spec See merge request !8422
\| * \| \| \| \| \|	Remove duplicate let in cycle_analytics_spec	Semyon Pupkov	2017-01-03	1	-1/+0
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'move-admin-users-spinach-tests-to-rspec' into 'master'	Rémy Coutable	2017-01-13	3	-264/+141
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin users spinach tests to rspec See merge request !8395
\| * \| \| \| \|	Tiny refactoring example in admin users feature spec	Semyon Pupkov	2017-01-02	1	-9/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Move admin users spinach tests to rspec	Semyon Pupkov	2017-01-02	3	-255/+132
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \| \|	Merge branch 'refactor-controller-params' into 'master'	Robert Speicher	2017-01-12	2	-21/+66
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor controller params See merge request !8522
\| * \| \| \| \|	Refactor authorized params in GroupsController	Rémy Coutable	2017-01-12	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Refactor allowed params in ServiceParams	Rémy Coutable	2017-01-12	1	-19/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '24185-legacy-ci-status-reactive-cache' into 'security'	Robert Speicher	2017-01-12	15	-311/+457
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use ReactiveCaching to update external CI status asynchronously See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2055
* \| \| \| \|	Merge branch '26615-pipeline-status-cell' into 'master'	Annabel Dunstone Gray	2017-01-12	2	-6/+10
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes pipeline status cell is too wide by adding missing classes in table head cells Closes #26615 See merge request !8549
\| * \| \| \|	Fixes pipeline status cell is too wide by adding missing classes in table ↵26615-pipeline-status-cell	Filipa Lacerda	2017-01-12	2	-6/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	head cells Adds mr id to changelog
* \| \| \| \|	Merge branch 'add-changelog-search-bar-first-iteration' into 'master'	Jacob Schatz	2017-01-12	1	-0/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog for search-bar-first-iteration See merge request !8546
\| * \| \| \| \|	Add changelog for search-bar-first-iteration	Clement Ho	2017-01-12	1	-0/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'redundant-parenthesis-removal-in-test' into 'master'	Robert Speicher	2017-01-12	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant parentheses in TodosController spec [ci skip] See merge request !8548
\| * \| \| \| \|	fixes the issue	Tiago Botelho	2017-01-12	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'use-configured-git' into 'master'	Douwe Maan	2017-01-12	5	-14/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use configured git rather thans system git See merge request !8460
\| * \| \| \| \|	Use configured git rather than system gituse-configured-git	Robert Schilling	2017-01-05	5	-14/+14
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'zj-unadressable-url-variables' into 'master'	Douwe Maan	2017-01-12	4	-18/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not check for valid url for .gitlab-ci.yml Closes #22970 See merge request !8451
\| * \| \| \| \| \|	Add changelog [ci skip]zj-unadressable-url-variables	Z.J. van de Weg	2017-01-05	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Do not check for valid url for .gitlab-ci.yml	Z.J. van de Weg	2017-01-05	3	-18/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Until this commit, GitLab would check if the URL in your .gitlab-ci.yml would be valid and adressable. However, this approach is rather limited. To begin, the URL couldn't be http://example:$PORT/my-project, as the PORT value would be interpolated after checking if the URL was valid, which its not. Also this gem will limit the amount of protocols allowed. This commit doesn't check, at all, if the URL is valid. This is now the responsablilty of the user. In my opion this is right, as the user ultimately benefits from a correct URL, but also, its impossible to cover all cases.
* \| \| \| \| \| \|	Merge branch 'fill-authorized-projects' into 'master'	Douwe Maan	2017-01-12	3	-0/+52
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fill missing authorized projects rows Closes #26194 See merge request !8476
\| * \| \| \| \| \| \|	Fill missing authorized projects rowsfill-authorized-projects	Yorick Peterse	2017-01-11	3	-0/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that the project_authorizations rows exist for all users for which this data has not yet been populated. Fixes #26194
* \| \| \| \| \| \| \|	Merge branch 'fix-more-orphans-remove-undeleted-groups' into 'master'	Douwe Maan	2017-01-12	2	-24/+76
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove more orphans when removing stray namespaces Closes #25146 See merge request !7841
\| * \| \| \| \| \| \| \|	Remove more orphans when removing stray namespacesfix-more-orphans-remove-undeleted-groups	Yorick Peterse	2017-01-11	2	-24/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25146
* \| \| \| \| \| \| \| \|	Merge branch '26109-preserve-scroll-position-on-autoreload' into 'master'	Alfredo Sumaran	2017-01-12	2	-2/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Scroll to bottom on build completion if autoscroll was active Closes #26109 See merge request !8391
\| * \| \| \| \| \| \| \| \|	Use string constant variable for `#down-build-trace`26109-preserve-scroll-position-on-autoreload	Kushal Pandya	2017-01-12	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use better approach to access hash	Kushal Pandya	2017-01-12	1	-5/+2
\| \| \| \| \| \| \| \| \| \|