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

	Commit message (Collapse)	Author	Age	Files	Lines
*	[Rails5] Fix Ci::Pipeline validator for sourceblackst0ne-rails5-fix-spec-models-ci-pipeline_spec-rb	blackst0ne	2018-05-12	1	-1/+11
\| \| \| \| \| \| \| \| \|	In Rails 5 enum returns value instead of key. For this case, the `NilClass` is returned instead of `unknown` which breaks validation of the `source` attribute. This commit adds a custom validatior that returns the correct result for both rails4 and rails5.
*	Merge branch 'dz-add-2fa-filter' into 'master'	Douwe Maan	2018-05-11	8	-15/+115
\|\ \| \| \| \| \| \| \| \|	Add 2FA filter to group members page See merge request gitlab-org/gitlab-ce!18483
\| *	Add 2FA filter to group members page	Dmitriy Zaporozhets	2018-05-10	8	-15/+115
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Show 2fa badge on a group members page * Make group members page UI consistent with project members page * Fix ambiguous sql in User.with/without_two_factor methods Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'zj-wiki-find-file-opt-out' into 'master'	Douwe Maan	2018-05-11	2	-1/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wiki Find Page to opt_out Closes gitaly#894 See merge request gitlab-org/gitlab-ce!18895
\| * \|	Wiki Find Page to opt_out	Zeger-Jan van de Weg	2018-05-11	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/894
* \| \|	Merge branch 'blackst0ne-rails5-bump-rails5-to-5-0-7' into 'master'	Douwe Maan	2018-05-11	2	-63/+59
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "[Rails5] Bump Rails5 to 5.0.7" Closes #46234 See merge request gitlab-org/gitlab-ce!18888
\| * \| \|	[Rails5] Bump Rails to 5.0.7 and set `atomic` to 1.1.99blackst0ne-rails5-bump-rails5-to-5-0-7	blackst0ne	2018-05-11	2	-63/+59
\| \|/ / \| \| \| \| \| \| \| \| \|	atomic 1.1.100 was yanked by its author.
* \| \|	Merge branch '46233-rails5-fix-nomethoderror-undefined-method-for-3-string' ↵	Douwe Maan	2018-05-11	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "[Rails5] Fix `NoMethodError: undefined method `-' for "3":String`" Closes #46233 See merge request gitlab-org/gitlab-ce!18892
\| * \| \|	[Rails5] Fix `per_page` in lib/gitlab/multi_collection_paginator.rb46233-rails5-fix-nomethoderror-undefined-method-for-3-string	blackst0ne	2018-05-11	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Rails 5 the `per_page` argument came from `params` is String but an Integer is expected. This commit explicitly converts `per_page` to an Integer. It fixes the errors like: ``` 1) Groups::ChildrenController GET #index for subgroups filtering children succeeds if multiple pages contain matching subgroups Failure/Error: hash[page] = second_collection.page(second_collection_page) .per(per_page - paginated_first_collection(page).size) .padding(offset) NoMethodError: undefined method `-' for "3":String Did you mean? -@ # ./lib/gitlab/multi_collection_paginator.rb:42:in `block in paginated_second_collection' # ./lib/gitlab/multi_collection_paginator.rb:46:in `paginated_second_collection' # ./lib/gitlab/multi_collection_paginator.rb:14:in `paginate' # ./app/finders/group_descendants_finder.rb:52:in `children' # ./app/finders/group_descendants_finder.rb:34:in `execute' # ./app/controllers/groups/children_controller.rb:36:in `setup_children' # ./app/controllers/groups/children_controller.rb:18:in `index' # ./lib/gitlab/i18n.rb:50:in `with_locale' # ./lib/gitlab/i18n.rb:56:in `with_user_locale' # ./app/controllers/application_controller.rb:351:in `set_locale' # ./spec/controllers/groups/children_controller_spec.rb:182:in `block (5 levels) in <top (required)>' # ./spec/spec_helper.rb:198:in `block (2 levels) in <top (required)>' ```
* \| \|	Merge branch 'blackst0ne-rails5-fix-route-source-can-t-be-blank' into 'master'	Douwe Maan	2018-05-11	1	-1/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "[Rails5] Fix `Route source can't be blank`" Closes #46228 See merge request gitlab-org/gitlab-ce!18890
\| * \| \|	[Rails5] Fix `Route source can't be blank`blackst0ne-rails5-fix-route-source-can-t-be-blank	blackst0ne	2018-05-11	1	-1/+3
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Rails 5.0 automatic inverse does not work for polymorphic relathionships. It was fixed in Rails 5.2: https://github.com/rails/rails/pull/28808 Until that the `inverse_of: :source` argument should be set explicitly.
* \| \|	Merge branch '46225-rails5-fix-app-views-groups-issues-html-haml' into 'master'	Douwe Maan	2018-05-11	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "[Rails5] Fix app/views/groups/issues.html.haml" Closes #46225 See merge request gitlab-org/gitlab-ce!18889
\| * \| \|	[Rails5] Fix app/views/groups/issues.html.haml46225-rails5-fix-app-views-groups-issues-html-haml	blackst0ne	2018-05-11	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the errors like: ``` ActionView::Template::Error: Attempting to generate a URL from non-sanitized request parameters! An attacker can inject malicious data into the generated URL, such as changing the host. Whitelist and sanitize passed parameters to be secure. ```
* \| \|	Merge branch '5710-add-contact-sales-option-for-epics' into 'master'	Tim Zallmann	2018-05-11	1	-3/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support `js-close` as a removal class in UserCallout See merge request gitlab-org/gitlab-ce!18790
\| * \| \|	Support `js-close` as a removal class in UserCallout	Lukas Eipert	2018-05-11	1	-3/+6
\|/ / /
* \| \|	Merge branch 'ide-mr-open-file-fix' into 'master'	Filipa Lacerda	2018-05-11	3	-2/+27
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed none merge request files not being openable in the web IDE See merge request gitlab-org/gitlab-ce!18881
\| * \| \|	Fixed none merge request files not being openable in the web IDE	Phil Hughes	2018-05-10	3	-2/+27
\| \| \| \|
* \| \| \|	Merge branch ↵	Kamil Trzciński	2018-05-11	3	-11/+73
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-5911-extract-ee-specific-files-lines-for-spec-models-clusters' into 'master' Backport EE specific cluster spec changes to CE See merge request gitlab-org/gitlab-ce!18866
\| * \| \| \|	Backport CE changes from gitlab-ee#518a29073a9	Matija Čupić	2018-05-10	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Stub deployments in Clusters::Platforms::Kubernetes spec	Matija Čupić	2018-05-10	1	-1/+4
\| \| \| \| \|
\| * \| \| \|	Backport KubernetesHelper deployment related changes	Matija Čupić	2018-05-10	1	-3/+66
\| \| \| \| \|
\| * \| \| \|	Backport EE runner spec changes to CE	Matija Čupić	2018-05-10	1	-5/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-registry-created-at-tooltip' into 'master'	Kamil Trzciński	2018-05-11	2	-1/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing tooltip to creation date on container registry overview Closes #34229 See merge request gitlab-org/gitlab-ce!18767
\| * \| \| \| \|	Add changelog entry	Lars Greiss	2018-05-07	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Lars Greiss <l.greiss@mediacologne.de>
\| * \| \| \| \|	Add missing tooltip to creation date on container registry overview	Lars Greiss	2018-05-07	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Lars Greiss <l.greiss@mediacologne.de>
* \| \| \| \| \|	Merge branch 'zj-validation-initializer' into 'master'	Kamil Trzciński	2018-05-11	4	-32/+39
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove method call to deprecated method See merge request gitlab-org/gitlab-ce!18815
\| * \| \| \| \| \|	Remove method call to deprecated method	Zeger-Jan van de Weg	2018-05-11	4	-32/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Given the settings initializer creates Gitaly Storage Settings objects already, the calls to path can be moved to that initializer.
* \| \| \| \| \| \|	Merge branch 'correct-runner-type-when-assigning-shared-to-project' into ↵	Kamil Trzciński	2018-05-11	2	-7/+27
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Ensure runner_type is updated correctly when assigning shared runner to project See merge request gitlab-org/gitlab-ce!18874
\| * \| \| \| \| \| \|	Ensure Ci::Runner#assign_to errors for group runnerscorrect-runner-type-when-assigning-shared-to-project	Dylan Griffith	2018-05-10	2	-7/+22
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Ensure runner_type is updated correctly when assigning shared runner to project	Dylan Griffith	2018-05-10	2	-1/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '46210-terms-acceptance-dropdown-menu' into 'master'	Tim Zallmann	2018-05-11	3	-4/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Terms acceptance dropdown menu" Closes #46210 See merge request gitlab-org/gitlab-ce!18862
\| * \| \| \| \| \| \| \|	46210 Display logo and user dropdown on mobile for terms page and fix styling46210-terms-acceptance-dropdown-menu	tauriedavis	2018-05-09	3	-4/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '40725-move-mr-external-link-to-right' into 'master'	Phil Hughes	2018-05-11	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Move external link icon to end of link instead of front" Closes #40725 See merge request gitlab-org/gitlab-ce!18828
\| * \| \| \| \| \| \| \| \|	Moves MR widget external link icon to the right	Jacopo	2018-05-08	2	-1/+6
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs-42067-document-runner-registration-api' into 'master'	Achilleas Pipinellis	2018-05-11	2	-0/+88
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for Runner Registration API Closes #42067 See merge request gitlab-org/gitlab-ce!16484
\| * \| \| \| \| \| \| \| \|	Expand documentation for Runners API	Mark Fletcher	2018-05-10	2	-0/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Document Registation - POST `/runners/` - Document Deletion - DELETE `/runners/` - Document Verification - POST `/runners/verify/
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-helm-init-before-helm-repo-add' into 'master'	Achilleas Pipinellis	2018-05-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Helm init before helm repo add See merge request gitlab-org/gitlab-ce!18882
\| * \| \| \| \| \| \| \| \|	Helm init before helm repo add	Maxime	2018-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '44956-wiki-headings-no-longer-show-anchor-link' into 'master'	Clement Ho	2018-05-10	4	-7/+12
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Wiki headings no longer show anchor link" Closes #44956 See merge request gitlab-org/gitlab-ce!18591
\| * \| \| \| \| \| \| \| \| \|	Fix missing anchor link on wiki page44956-wiki-headings-no-longer-show-anchor-link	Jose	2018-05-08	4	-7/+12
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'bw-fix-sha-attribute' into 'master'	Stan Hu	2018-05-10	2	-5/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ShaAttribute crashes with ArgumentError if column doesn't exist See merge request gitlab-org/gitlab-ce!18880
\| * \| \| \| \| \| \| \| \| \|	only issue a warning if column doesn't exist	Brett Walker	2018-05-10	2	-5/+8
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-gon' into 'master'	Robert Speicher	2018-05-10	2	-4/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gon ~> 6.1.0 to ~> 6.2 See merge request gitlab-org/gitlab-ce!18764
\| * \| \| \| \| \| \| \| \| \|	Update gon ~> 6.1.0 to ~> 6.2	Pirate Praveen	2018-05-05	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/wiki-find-page-invalid-encoding' into 'master'	Robert Speicher	2018-05-10	4	-1/+31
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix finding wiki pages when they have invalidly-encoded content Closes #43715 See merge request gitlab-org/gitlab-ce!18856
\| * \| \| \| \| \| \| \| \| \|	Fix finding wiki pages when they have invalidly-encoded content	Ahmad Sherif	2018-05-09	4	-1/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #43715
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'ide-hide-merge-request-if-disabled' into 'master'	Filipa Lacerda	2018-05-10	5	-1/+26
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide merge request option in IDE when merge requests are disabled Closes #45698 See merge request gitlab-org/gitlab-ce!18857
\| * \| \| \| \| \| \| \| \| \| \|	fixed specs	Phil Hughes	2018-05-10	2	-7/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Hide merge request option in IDE when merge requests are disabled	Phil Hughes	2018-05-09	4	-1/+29
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #45698
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jr-46209-web-ide-copy' into 'master'	Tim Zallmann	2018-05-10	2	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix outdated web ide copy See merge request gitlab-org/gitlab-ce!18861