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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Bring changes from EEunify-container_registry_authentication_service_spec.rb	Lin Jen-Shin	2018-06-21	1	-0/+13
\|
*	Changes tab VUE refactoring	Felipe Artur	2018-06-21	102	-1233/+4237
\|
*	Merge branch 'da-usage-ping' into 'master'	Sean McGivern	2018-06-21	1	-15/+16
\|\ \| \| \| \| \| \| \| \|	Add enabled prefix to feature keys to be consistent with other keys See merge request gitlab-org/gitlab-ce!20043
\| *	Add enabled prefix to feature keys to be consistent with other keysda-usage-ping	Douglas Barbosa Alexandre	2018-06-20	1	-15/+16
\| \|
* \|	Merge branch 'dm-label-reference-period' into 'master'	Sean McGivern	2018-06-21	1	-3/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Properly detect label reference if followed by period or question mark See merge request gitlab-org/gitlab-ce!19965
\| * \|	Add spec for more examples of trailing punctuation that should be ignoreddm-label-reference-period	Douwe Maan	2018-06-20	1	-3/+5
\| \| \|
\| * \|	Properly detect label reference if followed by period or question mark	Douwe Maan	2018-06-18	1	-2/+2
\| \| \|
* \| \|	Merge branch 'rails5-fix-48140' into 'master'	Rémy Coutable	2018-06-21	2	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails 5 fix Capybara::ElementNotFound: Unable to find visible css #modal-revert-commit Closes #48140 et #48139 See merge request gitlab-org/gitlab-ce!20044
\| * \| \|	Rails 5 fix Capybara::ElementNotFound: Unable to find visible css ↵	Jasper Maes	2018-06-20	2	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#modal-revert-commit and expected: "/bar" got: "/foo"
* \| \| \|	Merge branch 'zj-raw-changes-mandatory' into 'master'	Douwe Maan	2018-06-21	1	-35/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raw changes calculation is Gitaly only now Closes gitaly#1138 See merge request gitlab-org/gitlab-ce!20057
\| * \| \| \|	Raw changes calculation is Gitaly only now	Zeger-Jan van de Weg	2018-06-21	1	-35/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/1138
* \| \| \| \|	Merge branch 'bvl-finder-methods-cop' into 'master'	Douwe Maan	2018-06-21	2	-3/+57
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a cop for `FinderMethods` Closes #42705 See merge request gitlab-org/gitlab-ce!19951
\| * \| \| \|	Add a cop for `FinderMethods`bvl-finder-methods-cop	Bob Van Landuyt	2018-06-20	2	-3/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This notifies developers when calling `find(_by!)` chained on `execute`. And suggests using the methods from `FinderMethods`. These will perform the correct authorization checks on the resource when it is found.
* \| \| \| \|	Merge branch 'mk/fix-n-plus-1-queries-in-uploads-check-rake-task' into 'master'	Stan Hu	2018-06-20	1	-8/+37
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix N+1 queries in uploads check rake task Closes #47924 See merge request gitlab-org/gitlab-ce!20012
\| * \| \| \| \|	Avoid N+1 queries while processing uploads	Michael Kozono	2018-06-20	1	-8/+37
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'sh-fallback-to-first-tab-signin' into 'master'	Clement Ho	2018-06-20	1	-0/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fall back to the first sign-in tab if the local storage value is bad See merge request gitlab-org/gitlab-ce!20050
\| * \| \| \| \|	Fall back to the first sign-in tab if the local storage value is bad	Stan Hu	2018-06-20	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If `current_signin_tab` is `#crowd`, then no tab will be active. Fix this by using the first available tab. Relates to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20049#note_82996324
* \| \| \| \| \|	Merge branch '47488-remove-unmergeable-notification-for-no-commits' into ↵	Robert Speicher	2018-06-20	3	-44/+15
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Notify only merge request unmergeable due to conflict See merge request gitlab-org/gitlab-ce!19548
\| * \| \| \| \|	Notify only when unmergeable due to conflict	Mark Chao	2018-06-20	3	-44/+15
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is still the edge case when 'no commits' changes to 'conflict' would not trigger notification, which we ignore for now. Calling can_be_merged? can cause exception (e.g. non-UTF8) Ignore those by rescueing. Remove unmergeable_reason as now only conflict is notified Update spec
* \| \| \| \|	Merge branch 'rs-platform-feature-spec-parity' into 'master'	Rémy Coutable	2018-06-20	1	-2/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the stubbed methods for SAML authorize paths more specific See merge request gitlab-org/gitlab-ce!20009
\| * \| \| \| \|	Make the stubbed methods for SAML authorize paths more specificrs-platform-feature-spec-parity	Robert Speicher	2018-06-19	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Globally stubbing any instance of `Object` seems like a very bad idea, and it led to test failures here: - https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/76025159 - https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/76024972
* \| \| \| \| \|	Merge branch 'limit-metrics-content-type' into 'master'	Stan Hu	2018-06-20	1	-1/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit the action suffixes in transaction metrics See merge request gitlab-org/gitlab-ce!20032
\| * \| \| \| \| \|	Limit the action suffixes in transaction metricslimit-metrics-content-type	Yorick Peterse	2018-06-20	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There seem to be a lot of cases where the suffix of an action (e.g. ".html") is set to bogus data, such as "/" or entire URLs. This can increase cardinality of our metrics, and isn't very useful for monitoring and filtering. To work around this, we enforce a whitelist containing a few suffixes we actually care about. Suffixes not supported will be grouped under the action without a suffix. This means that a request to "FooController#bar.jpeg" will be assigned to "FooController#bar".
* \| \| \| \| \| \|	Merge branch 'remove-allocations-gem' into 'master'	Stan Hu	2018-06-20	2	-8/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove remaining traces of the Allocations Gem See merge request gitlab-org/gitlab-ce!20029
\| * \| \| \| \| \| \|	Remove remaining traces of the Allocations Gemremove-allocations-gem	Yorick Peterse	2018-06-20	2	-8/+0
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15834 we removed use of the data produced by the Allocations Gem. However, we never removed the code that just enables tracking of allocations. In this commit we remove all remaining traces of this Gem.
* \| \| \| \| \| \|	Merge branch 'leipert-eslint-report-unused-directives' into 'master'	Mike Greiling	2018-06-20	25	-31/+20
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use eslint to find unused directives See merge request gitlab-org/gitlab-ce!19940
\| * \| \| \| \| \|	ensure that `import/no-unresolved` does not trigger for our fixture filesleipert-eslint-report-unused-directives	Lukas Eipert	2018-06-20	5	-8/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	remove all unused eslint-disable rules	Lukas Eipert	2018-06-20	20	-23/+16
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'zj-can-be-merged' into 'master'	Douwe Maan	2018-06-20	1	-28/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move mergablility check to Gitaly Closes gitaly#889 See merge request gitlab-org/gitlab-ce!20019
\| * \| \| \| \| \| \|	Move mergablility check to Gitalyzj-can-be-merged	Zeger-Jan van de Weg	2018-06-20	1	-28/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/889
* \| \| \| \| \| \| \|	Fix: Serve favicon image always from the main GitLab domain to avoid issues ↵	Alexis Reigel	2018-06-20	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with CORS
* \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-06-20	1	-0/+38
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'47631-operations-kubernetes-option-is-always-visible-when-repository-or-builds-are-disabled' into 'master' Operations and Kubernetes option should be omitted when repository or builds are disabled Closes #47631 See merge request gitlab-org/gitlab-ce!19835
\| * \| \| \| \| \| \|	Operations and Kubernetes items are now omitted in the sidebar when ↵47631-operations-kubernetes-option-is-always-visible-when-repository-or-builds-are-disabled	Tiago Botelho	2018-06-20	1	-0/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	repository or builds are disabled
* \| \| \| \| \| \| \|	Resolve "Unable to install Prometheus on Clusters: 'Error: Chart ↵	Mayra Cabrera	2018-06-20	6	-30/+44
\| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	incompatible with Tiller v2.7.0'"
* \| \| \| \| \| \|	Merge branch '48100-fix-branch-not-shown' into 'master'	Rémy Coutable	2018-06-20	1	-0/+16
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Set the language setting to something other than English, the branch of Merge Request will not be visible." Closes #48100 See merge request gitlab-org/gitlab-ce!20016
\| * \| \| \| \| \|	The json keys of ref switcher should not be translatedhiroponz/gitlab-ce-48100-fix-branch-not-shown	Hiroyuki Sato	2018-06-20	1	-0/+16
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'rails5-fix-48104' into 'master'	Rémy Coutable	2018-06-20	1	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false}) received: 0 times Closes #48104 See merge request gitlab-org/gitlab-ce!20004
\| * \| \| \| \| \|	Rails5 fix expected: 1 time with arguments: (97, anything, ↵	Jasper Maes	2018-06-19	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	{"squash"=>false}) received: 0 times
* \| \| \| \| \| \|	Merge branch 'rails5-fix-pages-controller' into 'master'	Rémy Coutable	2018-06-20	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix Projects::PagesController spec See merge request gitlab-org/gitlab-ce!20007
\| * \| \| \| \| \| \|	Rails5 fix Projects::PagesController spec	Jasper Maes	2018-06-19	1	-2/+2
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ce-5024-filename-search' into 'master'	Sean McGivern	2018-06-20	3	-1/+82
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement filtering by filename on code search Closes #43627 See merge request gitlab-org/gitlab-ce!19509
\| * \| \| \| \| \|	Implement filtering by filename on code searchce-5024-filename-search	Mario de la Ossa	2018-06-19	3	-1/+82
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'zj-lfs-pointers' into 'master'	Douwe Maan	2018-06-20	1	-36/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LFS changes are detected by Gitaly Closes gitaly#935 See merge request gitlab-org/gitlab-ce!19995
\| * \| \| \| \| \| \|	LFS changes are detected by Gitalyzj-lfs-pointers	Zeger-Jan van de Weg	2018-06-19	1	-36/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/935
* \| \| \| \| \| \| \|	Updated horizontal ellipsis icon for text-expander	Constance Okoghenun	2018-06-20	1	-1/+1
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Resolve "Remove “commented” from comment system notes"	Constance Okoghenun	2018-06-19	1	-1/+0
\| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-branch-api-can-push' into 'master'	Robert Speicher	2018-06-19	1	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose whether current user can push into a branch on branches API See merge request gitlab-org/gitlab-ce!19958
\| * \| \| \| \| \|	Expose whether current user can push into a branch on branches APIdm-branch-api-can-push	Douwe Maan	2018-06-18	1	-1/+2
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-flakey-groups-filter-list-specs' into 'master'	Rémy Coutable	2018-06-19	2	-0/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix flakey time-senstive group filter specs See merge request gitlab-org/gitlab-ce!19880
\| * \| \| \| \| \|	Fix flakey time-senstive group filter specsfix-flakey-groups-filter-list-specs	Eric Eastwood	2018-06-14	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This passed previously because the filtered group search is debounced by 0.5s. The test cleared the input, entered `group1`, cleared the input, entered nothing, and the all of groups are still listed because of the 0.5s debounce hasn't triggered and the test passes before anything is actually filtered. Even if we assert that the list is filtered before clearing the input, the test still fails because the nature of the `fill_in 'filter', with: ""` method is that ["if you're setting the value to "", no keys are ever actually sent, hence no [`input`] event"](https://github.com/teamcapybara/capybara/issues/203#issuecomment-557281) and we never filter back to everything in the list. So the solution is two-fold, add in the assertions that the list is actually filtered after each step. Then use a method that fills the input with proper events fired.