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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move default values to ApplicationSetting::DEFAULTS and use it in ↵	Rémy Coutable	2017-01-15	2	-69/+45
\| \| \| \| \| \|	CurrentSettings Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'bug/project-feature-compatibility' into 'master'	Douwe Maan	2017-01-14	2	-1/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Mutate the attribute instead of issuing a write operation to the DB in `ProjectFeaturesCompatibility` concern. Closes gitlab-ee#1520 See merge request !8552
\| *	Mutate the attribute instead of issuing a write operation to the DBbug/project-feature-compatibility	Gabriel Mazetto	2017-01-12	2	-1/+6
\| \| \| \| \| \| \| \|	This fixes gitlab-org/gitlab-ee#1520
* \|	Merge branch ↵	Douwe Maan	2017-01-14	2	-5/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-exist' into 'master' Resolve "`Gitlab::Checks::ChangeAccess` looks for user permissions that don't exist" Closes #25018 See merge request !8551
\| * \|	Remove useless permission checks in Gitlab::Checks::ChangeAccess25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-exist	Rémy Coutable	2017-01-12	2	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch '26587-metrics-middleware-endpoint-is-nil' into 'master'	Yorick Peterse	2017-01-14	3	-4/+26
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Metrics middleware: endpoint is nil" Closes #26587 See merge request !8544
\| * \| \|	Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route26587-metrics-middleware-endpoint-is-nil	Rémy Coutable	2017-01-12	3	-4/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`endpoint.route` is calling `env[Grape::Env::GRAPE_ROUTING_ARGS][:route_info]` but `env[Grape::Env::GRAPE_ROUTING_ARGS]` is `nil` in the case of a 405 response Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'fix-build-sort-order' into 'master'	Robert Speicher	2017-01-13	4	-1/+30
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Sort order for pipeline build lists doesn't properly handle numbers" Closes #25428 See merge request !8277
\| * \| \| \|	revise sortable_name test formatting	Mike Greiling	2017-01-13	1	-4/+1
\| \| \| \| \|
\| * \| \| \|	prefer unit test on model over view testfix-build-sort-order	Mike Greiling	2017-01-02	2	-35/+22
\| \| \| \| \|
\| * \| \| \|	rename sort method	Mike Greiling	2017-01-02	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	add CHANGELOG.md entry for !8277	Mike Greiling	2017-01-02	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	add tests for natural sorting of build names	Mike Greiling	2017-01-02	1	-0/+35
\| \| \| \| \|
\| * \| \| \|	add natural sorting token for build names	Mike Greiling	2017-01-02	2	-1/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-single-team-specs' into 'master'	Robert Speicher	2017-01-13	2	-8/+88
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve single mattermost team select disabled state See merge request !8276
\| * \| \| \| \|	Improve disabled state selectfix-single-team-specs	Luke "Jared" Bennett	2017-01-13	2	-8/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tests
* \| \| \| \| \|	Merge branch 'fix/merge-separate-build-spec-files' into 'master'	Robert Speicher	2017-01-13	2	-1341/+1275
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge separate build spec files into one in correct location Closes #24579 See merge request !8564
\| * \| \| \| \| \|	Fix Rubocop offense in build specsfix/merge-separate-build-spec-files	Grzegorz Bizon	2017-01-13	1	-1/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove empty build spec file from invalid location	Grzegorz Bizon	2017-01-13	1	-6/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge build specs into file that has valid location	Grzegorz Bizon	2017-01-13	2	-1335/+1276
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/serialized-commit-path' into 'master'	Rémy Coutable	2017-01-13	3	-4/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update commit entity to point to valid commit page Closes #26624 See merge request !8558
\| * \| \| \| \| \| \|	Add Changelog for commit links fix on pipelines pagefix/serialized-commit-path	Grzegorz Bizon	2017-01-13	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update commit entity to point to valid commit page	Grzegorz Bizon	2017-01-13	2	-4/+6
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'zj-fix-broken-link-docs' into 'master'	Robert Speicher	2017-01-13	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link in docs Closes #26544 [ci skip] See merge request !8529
\| * \| \| \| \| \| \|	Fix broken link in docszj-fix-broken-link-docs	Z.J. van de Weg	2017-01-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'env-var-in-redis-config' into 'master'	Rémy Coutable	2017-01-13	5	-2/+28
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to use ENV variables in redis config See merge request !8073
\| * \| \| \| \| \| \| \|	Allow to use ENV variables in redis config	Semyon Pupkov	2017-01-13	5	-2/+28
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'milestone-issuable-labels-spacing' into 'master'	Annabel Dunstone Gray	2017-01-13	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed spacing of labels in issuable row on milestone#show See merge request !8563
\| * \| \| \| \| \| \| \|	Fixed spacing of labels in issuable row on milestone#show	Phil Hughes	2017-01-13	1	-0/+4
\|/ / / / / / / /
* \| \| \| \| \| \| \|	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