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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add tests for fixing discussion navigation51122-fix-navigating-discussions	André Luís	2018-11-06	2	-1/+64
\| \| \| \| \| \| \|	It adds a check for a dispatched action in action: expandDiscussion() Also adds relevant tests for added action renderFileForDiscussionId()
*	Resolve jumping to discussion in collapsed file	André Luís	2018-11-03	4	-5/+47
\| \| \| \| \| \| \|	Since we use incremental rendering on MR page, we need to trigger loading and expanding the collapsed file and then, when loaded, jump to discussion within.
*	Fix bug on mutation due to undefined discussions	André Luís	2018-11-03	1	-1/+1
\|
*	Avoid applying same discussion twice to same line	André Luís	2018-11-03	1	-3/+18
\|
*	Improve jumpToDiscussion re: expanding discussion	André Luís	2018-11-03	1	-11/+15
\|
*	Fix navigating unresolved discussions in MR tabs	André Luís	2018-11-03	4	-1/+11
\|
*	Merge branch 'add-scheduled-flag-to-job-entity' into 'master'	Kamil Trzciński	2018-11-02	5	-1/+17
\|\ \| \| \| \| \| \| \| \|	Add scheduled flag to job entity See merge request gitlab-org/gitlab-ce!22710
\| *	Add scheduled flag to job entity	Shinya Maeda	2018-11-02	5	-1/+17
\|/
*	Merge branch 'ce-jej/group-saml-discovery-token' into 'master'	Kamil Trzciński	2018-11-02	2	-3/+10
\|\ \| \| \| \| \| \| \| \|	TokenAuthenticatable allows non-unique tokens See merge request gitlab-org/gitlab-ce!22748
\| *	TokenAuthenticatable allows non-unique tokensce-jej/group-saml-discovery-token	James Edwards-Jones	2018-10-31	2	-3/+10
\| \| \| \| \| \| \| \| \| \|	Avoids needing an index to repeatedly check that the token doesn't already exist when saving.
* \|	Merge branch 'remove-ci_enable_scheduled_build-feature-flag' into 'master'	Kamil Trzciński	2018-11-02	5	-54/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove ci_enable_scheduled_build feature flag Closes #52183 See merge request gitlab-org/gitlab-ce!22742
\| * \|	Remove ci_enable_scheduled_build feature flag	Shinya Maeda	2018-11-02	5	-54/+14
\|/ /
* \|	Merge branch 'sh-optimize-reload-diffs-service' into 'master'	Sean McGivern	2018-11-02	6	-11/+33
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Significantly cut memory and SQL queries when reloading diffs See merge request gitlab-org/gitlab-ce!22725
\| * \|	Fix merge request specs that expect diff_files to be calledsh-optimize-reload-diffs-service	Stan Hu	2018-11-01	2	-8/+8
\| \| \|
\| * \|	Avoidp loading merge request diff files when not needed	Stan Hu	2018-11-01	2	-3/+6
\| \| \|
\| * \|	Significantly cut memory usage and SQL queries when reloading diffs	Stan Hu	2018-11-01	3	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By preloading certain models with the diff, we can eliminate many N+1 queries. For a push to the staging GitLab.com www-gitlab-com repository, this eliminates over 3000 SQL queries and appears to bring down the RSS usage by several gigabytes. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49703
* \| \|	Merge branch '52548-links-in-tabs-of-the-labels-index-pages-ends-with-html' ↵	Sean McGivern	2018-11-02	3	-1/+31
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Links in tabs of the labels index pages ends with `.html`" Closes #52548 See merge request gitlab-org/gitlab-ce!22716
\| * \| \|	Fix typo in labels_helper_spec.rb52548-links-in-tabs-of-the-labels-index-pages-ends-with-html	Dmitriy Zaporozhets	2018-11-01	1	-1/+1
\| \| \| \|
\| * \| \|	Fix bug when links in tabs of the labels index pages ends with .html	Dmitriy Zaporozhets	2018-10-31	3	-1/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'ab-45608-stuck-mr-query' into 'master'	Sean McGivern	2018-11-02	3	-1/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index to find stuck merge requests. Closes #45608 See merge request gitlab-org/gitlab-ce!22749
\| * \| \| \|	Add index to find stuck merge requests.ab-45608-stuck-mr-query	Andreas Brandl	2018-11-01	3	-1/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/45608#note_113803790 for query and plan. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/45608.
* \| \| \| \|	Merge branch 'gl-ui-progress-bar' into 'master'	Phil Hughes	2018-11-02	3	-2/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove gitlab-ui's progress bar from global See merge request gitlab-org/gitlab-ce!22705
\| * \| \| \| \|	Remove gitlab-ui's progress bar from global	Clement Ho	2018-11-02	3	-2/+10
\|/ / / / /
* \| \| \| \|	Merge remote-tracking branch 'origin/master' into dev-master	Jan Provaznik	2018-11-02	456	-3331/+4717
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'kinolaev-master-patch-91872' into 'master'	Dmitriy Zaporozhets	2018-11-02	2	-1/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change HELM_HOST in Auto-DevOps to work behind proxy See merge request gitlab-org/gitlab-ce!22596
\| \| * \| \| \| \|	Change HELM_HOST in Auto-DevOps to work behind proxy	Sergej	2018-11-01	2	-1/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'sh-link-bitbucket-server-import-docs' into 'master'	Evan Read	2018-11-01	1	-1/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link Bitbucket Server from import index page See merge request gitlab-org/gitlab-ce!22752
\| \| * \| \| \| \| \|	Link Bitbucket Server from import index pagesh-link-bitbucket-server-import-docs	Stan Hu	2018-11-01	1	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'sh-fix-generators-not-always-working' into 'master'	Robert Speicher	2018-11-01	1	-1/+5
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "rails g migration" not always using migration templates Closes #52651 See merge request gitlab-org/gitlab-ce!22592
\| \| * \| \| \| \| \| \|	Fix "rails g migration" not always using migration templatessh-fix-generators-not-always-working	Stan Hu	2018-10-25	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Normally, this is what's supposed to happen when you invoke `rails g generate migration`: 1. `Rails.application.load_generators` is called here: https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails/commands/commands_tasks.rb#L129 2. This loads the local `generator_templates` path in https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails/generators.rb#L69. However, when metrics are enabled, the application is eager loaded here in the initializer. This short-circuits the `load_generators` and loads `ActiveRecord::Generators::MigrationGenerator` automatically, so the custom path is never loaded properly. With this change, we skip the initializing of metrics and eager loading if generators are in use. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52651
\| * \| \| \| \| \| \| \|	Merge branch 'replace-tooltip-in-markdown-component' into 'master'	Clement Ho	2018-11-01	3	-10/+15
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace tooltip in markdown component with gl-tooltip See merge request gitlab-org/gitlab-ce!21989
\| \| * \| \| \| \| \| \| \|	Replace tooltip in markdown component with gl-tooltip	George Tsiolis	2018-10-31	3	-10/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'user-model-merge-conflicts' into 'master'	Robert Speicher	2018-11-01	2	-2/+11
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce merge conflicts in the User model See merge request gitlab-org/gitlab-ce!22697
\| \| * \| \| \| \| \| \| \| \|	Use a method for the has_many :keys in Projectuser-model-merge-conflicts	Yorick Peterse	2018-11-01	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This moves the `where` in the `has_many :keys` association in Project to the Key model. This allows EE to override this method, instead of modifying the source code directly.
\| \| * \| \| \| \| \| \| \| \|	Move LDAP sync time constant to a method	Yorick Peterse	2018-11-01	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This moves the `1.hour` constant used as the LDAP sync time to a separate method. This allows EE to override this method using a module, instead of directly modifying the source code.
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'sh-bump-puma-memory-limits' into 'master'	Robert Speicher	2018-11-01	1	-1/+5
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reserve more RAM for master process in Puma See merge request gitlab-org/gitlab-ce!22741
\| \| * \| \| \| \| \| \| \| \| \|	Reserve more RAM for master process in Pumash-bump-puma-memory-limits	Stan Hu	2018-11-01	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Puma Worker Killer checks the total RAM used by both the master and worker processes. Bump the limits to N+1 instead of N workers to account for this.
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-for-assets-image' into 'master'	Stan Hu	2018-11-01	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use CI_COMMIT_REF_SLUG when building assets image See merge request gitlab-org/gitlab-ce!22756
\| \| * \| \| \| \| \| \| \| \| \| \|	Use CI_COMMIT_REF_SLUG when building assets imagefix-for-assets-image	Ian Baum	2018-11-01	1	-1/+1
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Using CI_COMMIT_REF_NAME fails when the branch or tag contains special characters
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'ee-8121-geo-search-bar' into 'master'	Douglas Barbosa Alexandre	2018-11-01	1	-0/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport from Added a search bar to `Admin > Geo > Projects` See merge request gitlab-org/gitlab-ce!22747
\| \| * \| \| \| \| \| \| \| \| \| \|	Add render_if_exists to inject additional search field in EE	Gabriel Mazetto	2018-11-01	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows EE code to reuse the search partial and append additional query parameters to it, and have it preserved when searching.
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'db-schema-merge-conflicts' into 'master'	Robert Speicher	2018-11-01	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use merge_db_schema for db/schema.rb conflicts See merge request gitlab-org/gitlab-ce!22692
\| \| * \| \| \| \| \| \| \| \| \| \|	Use merge_db_schema for db/schema.rb conflictsdb-schema-merge-conflicts	Yorick Peterse	2018-11-01	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This Gem can be used to automatically resolve merge conflicts in db/schema.rb. To use it you still need to initialise the configuration, which can be done by running: merge_db_schema-init --force See https://gitlab.com/gitlab-org/release/framework/issues/42 for more information.
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-job-list-dynamic-timer' into 'master'	Clement Ho	2018-11-01	3	-3/+24
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add dynamic timer for delayed jobs in job list See merge request gitlab-org/gitlab-ce!22656
\| \| * \| \| \| \| \| \| \| \| \| \|	Add dynamic timer for delayed jobs in job listwinh-job-list-dynamic-timer	Winnie Hellmann	2018-11-01	3	-3/+24
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'related_mrs' into 'master'	Douglas Barbosa Alexandre	2018-11-01	4	-0/+184
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add referenced merge_requests endpoint Closes #39157 See merge request gitlab-org/gitlab-ce!21806
\| \| * \| \| \| \| \| \| \| \| \| \|	add related merge request endpoint	Helmut Januschka	2018-11-01	4	-0/+184
\| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'patch-31' into 'master'	Achilleas Pipinellis	2018-11-01	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes automatic URL formatting on Maven Page See merge request gitlab-org/gitlab-ce!22727
\| \| * \| \| \| \| \| \| \| \| \| \|	Fixes automatic URL formatting	Lyle Kozloff	2018-10-31	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any'	Sean McGivern	2018-11-01	12	-28/+142
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|