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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'unify-match_ids.rb' into 'master'	Robert Speicher	2018-06-22	1	-0/+7
\|\ \| \| \| \| \| \| \| \|	Unify spec/support/matchers/match_ids.rb See merge request gitlab-org/gitlab-ce!20108
\| *	Bring changes from EE	Lin Jen-Shin	2018-06-22	1	-0/+7
\| \|
* \|	Bring changes from EE	Lin Jen-Shin	2018-06-22	1	-0/+1
\|/
*	Merge branch 'blackst0ne-rails5-fix-data-store-spec' into 'master'	Kamil Trzciński	2018-06-22	1	-8/+0
\|\ \| \| \| \| \| \| \| \|	[Rails5] Fix "'-1' is not a valid data_store" See merge request gitlab-org/gitlab-ce!19917
\| *	[Rails5] Fix "'-1' is not a valid data_store"blackst0ne-rails5-fix-data-store-spec	blackst0ne	2018-06-16	1	-8/+0
\| \| \| \| \| \| \| \|	Part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19882
* \|	Merge branch 'update-large-tables-cop' into 'master'	Grzegorz Bizon	2018-06-22	1	-0/+20
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Disallow methods that copy data on large tables See merge request gitlab-org/gitlab-ce!20021
\| * \|	Disallow methods that copy data on large tables	Sean McGivern	2018-06-19	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	{change_column_type,rename_column}_concurrently both copy data from one column to another during a migration, which should not be done on GitLab.com. Instead, we should use background migrations.
* \| \|	Merge branch 'bjk/48176_ruby_gc' into 'master'	Yorick Peterse	2018-06-22	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ruby sampler metrics See merge request gitlab-org/gitlab-ce!20039
\| * \| \|	Cleanup ruby sampler metricsbjk/48176_ruby_gc	Ben Kochie	2018-06-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Use a simple counter for sampler duration instead of a histogram. * Use a counter to collect GC time. * Remove unused objects metric. * Cleanup metric names to match Prometheus conventions. * Prefix generic GC stats with `gc_stat`. * Include worker label on memory and file descriptor metrics.
* \| \| \|	Merge branch 'unify-filter_issues_spec.rb' into 'master'	Nick Thomas	2018-06-22	1	-2/+34
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Unify spec/features/issues/filtered_search/filter_issues_spec.rb See merge request gitlab-org/gitlab-ce!20070
\| * \| \|	Bring changes from EEunify-filter_issues_spec.rb	Lin Jen-Shin	2018-06-21	1	-2/+34
\| \| \| \|
* \| \| \|	Merge branch 'unify-redis_shared_examples.rb' into 'master'	Sean McGivern	2018-06-22	1	-1/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify spec/support/redis/redis_shared_examples.rb See merge request gitlab-org/gitlab-ce!20074
\| * \| \| \|	Bring changes from EEunify-redis_shared_examples.rb	Lin Jen-Shin	2018-06-21	1	-1/+8
\| \| \| \| \|
* \| \| \| \|	Merge branch 'unify-object_storage_spec.rb' into 'master'	Douwe Maan	2018-06-22	1	-0/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify object_storage_spec.rb with EE See merge request gitlab-org/gitlab-ce!20069
\| * \| \| \| \|	Bring this test from EEunify-object_storage_spec.rb	Lin Jen-Shin	2018-06-21	1	-0/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'unify-container_registry_authentication_service_spec.rb' into ↵	Grzegorz Bizon	2018-06-22	1	-0/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Unify spec/services/auth/container_registry_authentication_service_spec.rb See merge request gitlab-org/gitlab-ce!20071
\| * \| \| \| \| \|	Bring changes from EEunify-container_registry_authentication_service_spec.rb	Lin Jen-Shin	2018-06-21	1	-0/+13
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'unify-destroy_service_spec.rb' into 'master'	Robert Speicher	2018-06-21	1	-2/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use expect_next_instance_of to replace expect_any_instance_of See merge request gitlab-org/gitlab-ce!20072
\| * \| \| \| \| \|	Use expect_next_instance_of to replace expect_any_instance_ofunify-destroy_service_spec.rb	Lin Jen-Shin	2018-06-21	1	-2/+6
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Show a reCAPTCHA on signin page if custom header is set	Stan Hu	2018-06-21	2	-4/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will only be displayed if `X-GitLab-Show-Login-Captcha` is set as an HTTP header.
* \| \| \| \| \|	Merge branch 'move-boards-modal-empty-state-vue-component' into 'master'	Filipa Lacerda	2018-06-21	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move boards modal EmptyState vue component See merge request gitlab-org/gitlab-ce!20068
\| * \| \| \| \| \|	Move boards modal EmptyState vue component	George Tsiolis	2018-06-21	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Bring changes from EE	Lin Jen-Shin	2018-06-21	1	-1/+1
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ce-6436-6149-unify-project_creator_spec' into 'master'	Robert Speicher	2018-06-21	7	-11/+30
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Resolve "Extract EE specific files/lines for project_creator_spec" See merge request gitlab-org/gitlab-ce!19850
\| * \| \| \| \|	Implement `expect_next_instance_of` and use it	Lin Jen-Shin	2018-06-21	7	-11/+30
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need this because `expect_any_instance_of` doesn't work on prepended models. Now we could use the same code between CE/EE
* \| \| \| \|	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