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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'sh-fix-gitaly-server-info-cache' into 'master'	Mayra Cabrera	2019-07-19	1	-1/+1
\| \| \| \| \| \| \|	Fix Gitaly auto-detection caching Closes #64802 See merge request gitlab-org/gitlab-ce!30954
*	Merge branch 'ci_default_git_depth_only' into 'master'	Douglas Barbosa Alexandre	2019-07-18	1	-0/+1
\| \| \| \| \| \| \| \| \|	API: Allow changing only ci_default_git_depth See merge request gitlab-org/gitlab-ce!30888 (cherry picked from commit 0854f18352e72c2bcc0beca601d1ea48b490d1be) 0f585d0d API: Allow changing only ci_default_git_depth
*	Refactor RedisCounter and WebIdeCommitsCounter	Francisco Javier López	2019-07-17	5	-21/+25
\| \| \| \| \|	This MR refactor RedisCounter and WebIdeCommitsCounter to be reused by other components.
*	Merge branch 'jc-wrap-rugged-calls-with-disk-access' into 'master'	Stan Hu	2019-07-17	6	-19/+24
\|\ \| \| \| \| \| \| \| \|	Wrap rugged calls with access disk block See merge request gitlab-org/gitlab-ce!30592
\| *	Wrap rugged calls with access disk blockjc-wrap-rugged-calls-with-disk-access	John Cai	2019-07-16	6	-19/+24
\| \| \| \| \| \| \| \| \| \|	Whenever we use the rugged implementation, we are going straight to disk so we want to bypass the disk access check.
* \|	Merge branch 'issue-64645-asciidoctor-footnote-links' into 'master'	Nick Thomas	2019-07-17	1	-5/+28
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Preserve footnote link ids Closes #64645 See merge request gitlab-org/gitlab-ce!30790
\| * \|	Preserve footnote link ids	Guillaume Grossetie	2019-07-17	1	-5/+28
\| \| \|
* \| \|	Added submodule links to Submodule type in GraphQL API	Igor	2019-07-17	3	-3/+79
\| \| \| \| \| \| \| \| \| \| \| \|	This is part of migration of Folder View to Vue
* \| \|	Fix wrong pages access level default	Vladimir Shushlin	2019-07-17	1	-0/+128
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Set access level in before_validation hook - Add post migration for updating existing project_features
* \| \|	CE port of "Move external authorization service API management to EE"	Imre Farkas	2019-07-17	3	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \|	EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14598
* \| \|	Fetch latest link in the description for zoom link, add more tests and ↵	Rajendra kadam	2019-07-17	1	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \|	remove frontend spec unnecessary tests
* \| \|	Propagate PIP index URL	Fabien Catteau	2019-07-17	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Propagate PIP_INDEX_URL, PIP_EXTRA_INDEX_URL to the dependency-scanning Docker image to support Python projects depending on custom Pypi registries. These variables will be consumed by the gemnasium-python analyzer.
* \| \|	Merge branch '12800-read-and-write-user-admin-notes-via-api-ce' into 'master'	Stan Hu	2019-07-16	1	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport: Read and write User "Admin notes" via API See merge request gitlab-org/gitlab-ce!30775
\| * \| \|	CE: Read and write User "Admin notes" via API	manojmj	2019-07-17	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change adds the ability to read and write admin notes for a user via the USER API
* \| \| \|	Merge branch 'jc-fix-rugged-feature-flag-rake' into 'master'	Stan Hu	2019-07-16	1	-3/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add unset_rugged rake task Closes #64441 See merge request gitlab-org/gitlab-ce!30636
\| * \| \| \|	Add unset_rugged rake taskjc-fix-rugged-feature-flag-rake	John Cai	2019-07-11	1	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds an unset_rugged rake task that unsets all rugged feature flags. Also fixes the existing disable_rugged task to have it explicitly disable feature flags instead of just unsetting them.
* \| \| \| \|	Rename Redactor classes to ReferenceRedactor	Sarah Yasonik	2019-07-16	5	-6/+6
\| \| \| \| \|
* \| \| \| \|	Refactored WebIdeCommitsCount class	Francisco Javier López	2019-07-16	5	-19/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're adding more redis base counters to the web ide and other classes. We're refactoring this class in other to use the logic in other places.
* \| \| \| \|	Merge branch 'remove-support-for-legacy-pipeline-triggers' into 'master'	Kamil Trzciński	2019-07-16	3	-1/+18
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove support for legacy pipeline triggers Closes #30231 See merge request gitlab-org/gitlab-ce!30133
\| * \| \| \|	Do not import legacy triggers from project JSONremove-support-for-legacy-pipeline-triggers	Fabio Pitino	2019-07-15	1	-0/+7
\| \| \| \| \|
\| * \| \| \|	Ensure ImportExport maintains trigger ownership	Fabio Pitino	2019-07-15	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Allow use of legacy triggers with feature flag	Fabio Pitino	2019-07-15	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Keep feature flag disabled by default and turn off all functionality related to legacy triggers. * Block legacy triggers from creating pipeline * Highlight legacy triggers to be invalid via the UI * Make legacy triggers invalid in the model
* \| \| \| \|	Merge branch 'issue-64070-asciidoctor-section-anchors' into 'master'	Bob Van Landuyt	2019-07-16	2	-2/+29
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable section anchors Closes #64070 See merge request gitlab-org/gitlab-ce!30666
\| * \| \| \| \|	Enable section anchors	Guillaume Grossetie	2019-07-16	2	-2/+29
\| \| \| \| \| \|
* \| \| \| \| \|	Update Release API docs	Jason Goodman	2019-07-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include released_at parameter
* \| \| \| \| \|	Merge branch 'jc-remove-catfile-flag' into 'master'	Bob Van Landuyt	2019-07-16	2	-7/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove catfile cache feature flag See merge request gitlab-org/gitlab-ce!30750
\| * \| \| \| \| \|	Remove catfile cache feature flagjc-remove-catfile-flag	John Cai	2019-07-15	2	-7/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'zj-update-proto' into 'master'	Douwe Maan	2019-07-16	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly-Proto to 1.37.0 See merge request gitlab-org/gitlab-ce!30774
\| * \| \| \| \| \| \|	Upgrade Gitaly-Proto to 1.37.0	Zeger-Jan van de Weg	2019-07-16	1	-1/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was done to perform some local testing, but while the change was already made it made sense to commit the change.
* \| \| \| \| \| \|	Merge branch 'remove-complex-expressions-feature-flag' into 'master'	Kamil Trzciński	2019-07-16	3	-57/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing ci_variables_complex_expressions feature flag and deprecated code branches See merge request gitlab-org/gitlab-ce!30717
\| * \| \| \| \| \| \|	Removing ci_variables_complex_expressions feature flag and deprecated code ↵remove-complex-expressions-feature-flag	drew cimino	2019-07-12	3	-57/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	branches
* \| \| \| \| \| \| \|	Merge branch 'bw-enhance-rake-seed' into 'master'	James Lopez	2019-07-16	1	-2/+5
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow parameters for rake gitlab:seed:issues See merge request gitlab-org/gitlab-ce!30689
\| * \| \| \| \| \| \|	Allow parameters for rake gitlab:seed:issuesbw-enhance-rake-seed	Brett Walker	2019-07-15	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to specify backfill_weeks and average_issues_per_week
* \| \| \| \| \| \| \|	Merge branch '64407-vfazio-quirk-omniauth-strategies-openidconnect' into ↵	Stan Hu	2019-07-15	1	-0/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Convert client_auth_method to a Symbol for quirked OmniAuth providers Closes #64407 See merge request gitlab-org/gitlab-ce!30683
\| * \| \| \| \| \| \| \|	Symbolize client_auth_method for quirked providers	Vincent Fazio	2019-07-15	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Providers such as OpenIDConnect ultimately leverage the rack-oauth2 gem which requires the client_auth_method value to be defined as a symbol in order to correctly select the authorization method used. Derivative providers that specify OmniAuth::Strategies::OpenIDConnect as their strategy_class will also convert this value to a symbol. Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
* \| \| \| \| \| \| \| \|	Migrate null values for users.private_profile	Adam Hegyi	2019-07-15	2	-1/+18
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Background migration for changing null values to false - Set false as default value for private_profile DB column
* \| \| \| \| \| \| \|	Merge branch 'georgekoltsov/63955-fix-import-with-source-branch-deleted' ↵	Robert Speicher	2019-07-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Always return MR diff_refs if importing See merge request gitlab-org/gitlab-ce!30630
\| * \| \| \| \| \| \|	Add commit_id to AttributeCleaner::ALLOWED_REFERENCESgeorgekoltsov/63955-fix-import-with-source-branch-deleted	George Koltsov	2019-07-15	1	-1/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '63694-tls-opts-for-helm-wait' into 'master'	Sean McGivern	2019-07-15	2	-12/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab Managed App ensure helm version uses tls opts Closes #63694 See merge request gitlab-org/gitlab-ce!30654
\| * \| \| \| \| \| \|	GitLab Managed App ensure helm version uses tls opts63694-tls-opts-for-helm-wait	Dylan Griffith	2019-07-15	2	-12/+13
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The TLS opts were missing from helm version command which meant that it was just perpetually failing and hence wasting 30s of time waiting for a command to be successful that was never going to be successful. This never actually caused any errors because this loop will happily just fail 30 times without breaking the overall script but it was just a waste of installation time so now installing apps should be ~30s faster.
* \| \| \| \| \| \|	Filter Geo proxied data from api_json.logsh-filter-geo-output	Stan Hu	2019-07-14	1	-1/+2
\| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently the base64-encoded value of the push-to-secondary data is saved in `api_json.log`, and this can easily be hundreds of megabytes. We should filter this from the logs.
* \| \| \| \| \|	Remove auto ssl feature flags	Vladimir Shushlin	2019-07-12	1	-9/+2
\| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remove feature flag for admin settings * remove feature flag for domain settings
* \| \| \| \|	Merge branch 'js-specs-transactions' into 'master'	Andreas Brandl	2019-07-12	2	-7/+57
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use transactions in JS feature specs Closes #60207 See merge request gitlab-org/gitlab-ce!27496
\| * \| \| \| \|	Use transactions in JS feature specsjs-specs-transactions	Heinrich Lee Yu	2019-07-12	2	-7/+57
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses Rails transactional tests instead of DatabaseCleaner transaction strategy because that doesn't work with JS tests
* \| \| \| \|	Merge branch 'id-clean-up-mr-assignees-migration' into 'master'	Andreas Brandl	2019-07-12	1	-0/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cleanup migration for MR's multiple assignees See merge request gitlab-org/gitlab-ce!30269
\| * \| \| \| \|	Add cleanup migration for MR's mutliple assigneesid-clean-up-mr-assignees-migration	Igor Drozdov	2019-07-09	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The migration steals the remaining background jobs of populating MRs with assignees, executes them synchronously and then makes sure that all the assignees are migrated
* \| \| \| \| \|	Merge branch 'bvl-rename-routes-after-user-rename' into 'master'	Jan Provaznik	2019-07-12	3	-8/+106
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set the name of a user-namespace to the user name See merge request gitlab-org/gitlab-ce!23272
\| * \| \| \| \| \|	Fix incorrect namespaces & route for user-routes	Bob Van Landuyt	2019-07-09	2	-0/+106
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes the `Namespace#name` and `Route#name` for all user namespaces and their personal projects in case they don't match the user name anymore. More info info in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23272
\| * \| \| \| \| \|	Lesser Namespace#name validations	Bob Van Landuyt	2019-07-09	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we use `Namespace#path` to build routes and URLs we can lessen the restrictions on `Namespace#name` so it can accomodate a user's name.
* \| \| \| \| \| \|	Merge branch 'upgrade-rails-5-2-ce' into 'master'	Bob Van Landuyt	2019-07-12	5	-7/+8
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Upgrade to Rails 5.2 See merge request gitlab-org/gitlab-ce!30052