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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 11.10.0-rc2v11.10.0-rc2 11-10-stable-prepare-rc3	GitLab Release Tools Bot	2019-04-04	1	-1/+1
\|
*	Merge commit '6d000c9f9cbc65f92ed27ea55a14e5de9b11320d' into 11-10-stable	John T Skarbek	2019-04-04	77	-300/+1353
\|\
\| *	Merge branch '60057-fix-gitlab-schema-keyerror' into 'master'	Douglas Barbosa Alexandre	2019-04-04	2	-3/+13
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a KeyError in GitlabSchema Closes #60057 See merge request gitlab-org/gitlab-ce!27011
\| \| *	Fix a KeyError in GitlabSchema	Nick Thomas	2019-04-04	2	-3/+13
\| \| \|
\| * \|	Merge branch 'fj-rename-terminal-to-channel' into 'master'	Nick Thomas	2019-04-04	10	-24/+60
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Rename Workhorse terminal_specification to channel_specification See merge request gitlab-org/gitlab-ce!26939
\| \| *	Renamed terminal_specification to channel_specification	Francisco Javier López	2019-04-04	10	-24/+60
\| \|/ \| \| \| \| \| \| \| \| \| \|	We're moving from using terminology related to terminals when we refer to Websockets connections in Workhorse. It's more appropiate a concept like channel.
\| *	Merge branch '58375-reactive-caching-changes' into 'master'	Michael Kozono	2019-04-04	4	-3/+92
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Allow reactive caching to be used in services See merge request gitlab-org/gitlab-ce!26839
\| \| *	Allow reactive caching to be used in services	Reuben Pereira	2019-04-04	4	-3/+92
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for defining a reactive_cache_worker_finder function that will be used by the reactive_caching_worker to generate/initialize the calling object. This allows reactive caching to work with Services where the object cannot be obtained from DB but a new object can be initialized.
\| *	Merge branch '57831-allow-graphql-scalar-fields-to-be-authorized' into 'master'	Nick Thomas	2019-04-04	3	-41/+138
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow GraphQL Scalar-fields to be authorized Closes #57831 See merge request gitlab-org/gitlab-ce!26338
\| \| *	Use parent object when authorizing scalar types	Brett Walker	2019-04-04	3	-41/+138
\| \| \|
\| * \|	Merge branch 'mw-i18n-helpers' into 'master'	Nick Thomas	2019-04-04	10	-55/+155
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings in helpers See merge request gitlab-org/gitlab-ce!26845
\| \| * \|	Externalize strings in helpers	Martin Wortschack	2019-04-04	10	-55/+155
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	- Update qa selector - Update PO file
\| * \|	Merge branch '59995-ide-status-bar-vue-render-error' into 'master'	Phil Hughes	2019-04-04	5	-61/+94
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix vue render error for IDE status bar Closes #59995 See merge request gitlab-org/gitlab-ce!26979
\| \| * \|	Fix vue render error for IDE status bar	Paul Slaughter	2019-04-04	5	-61/+94
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	What? A Vue warning that `ide_status_bar` sent a `Boolean` to a `String` property (`img-src). What was the fix? Previously, `latestPipeline` could be one of the following values: \| \| \| \|----------\|--------\| \| `null` \| The pipeline hasn't loaded yet \| \| `false` \| The pipeline has loaded, but nothing was returned. \| \| `Object` \| The piepline has loaded. \| Giving a semantic meaning to different falsey values hurts maintainability. This commit fixes the above problem by removing the `false` value and introducing a `hasLoadedPipeline` state property.
\| * \| \|	Merge branch 'id-51433-sort-wiki-by-date' into 'master'	Douwe Maan	2019-04-04	12	-33/+259
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to sort wiki pages by date and title See merge request gitlab-org/gitlab-ce!25365
\| \| * \| \|	Allow to sort wiki pages by date and title	Igor	2019-04-04	12	-33/+259
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add controls for sorting by title and date - Execute Gitaly call which now accepts sorting params for wikis
\| * \| \|	Merge branch 'update-gitlab-shell' into 'master'	Douglas Barbosa Alexandre	2019-04-04	2	-1/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab Shell to v9.0.0 See merge request gitlab-org/gitlab-ce!27002
\| \| * \| \|	Update GitLab Shell to v9.0.0	Nick Thomas	2019-04-04	2	-1/+6
\| \| \|/ /
\| * \| \|	Merge branch '58405-basic-limiting-complexity-of-graphql-queries' into 'master'	Rémy Coutable	2019-04-04	8	-0/+137
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Basic limiting complexity of GraphQL queries Closes #58405 See merge request gitlab-org/gitlab-ce!26629
\| \| * \| \|	Initial field and query complexity limits58405-basic-limiting-complexity-of-graphql-queries	Brett Walker	2019-04-04	8	-0/+137
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It makes all Types::BaseField default to a complexity of 1. Queries themselves now have limited complexity, scaled to the type of user: no user, authenticated user, or an admin user.
\| * \| \| \|	Merge branch '58839-automatically-set-prometheus-step-interval' into 'master'	James Lopez	2019-04-04	4	-8/+67
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Automatically set Prometheus step interval" Closes #58839 See merge request gitlab-org/gitlab-ce!26441
\| \| * \| \| \|	Automatically set Prometheus step interval	Peter Leitzen	2019-04-04	4	-8/+67
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By computing the step interval passed to the query_range Prometheus API call we improve the performance on the Prometheus server and GitLab by reducing the amount of data points sent back and prevent Prometheus from sending errors when requesting longer intervals.
\| * \| \| \|	Merge branch 'xanf/gitlab-ce-transfer-disables-js' into 'master'	Sean McGivern	2019-04-04	3	-3/+8
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Failing group transfer disables expandable sections" Closes #45511 See merge request gitlab-org/gitlab-ce!26837
\| \| * \| \| \|	Redirect to edit page on group transfer failurexanf/gitlab-ce-transfer-disables-js	Illya Klymov	2019-04-03	3	-3/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '59570-confidential-quick-action' into 'master'	Sean McGivern	2019-04-04	2	-36/+34
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract confidential quick action spec to a shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26913
\| \| * \| \| \| \|	Extract confidential quick action spec to a shared example59570-confidential-quick-action	Alexandru Croitor	2019-04-04	2	-36/+34
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch '58881-doc-registry-s3-permissions-scopes' into 'master'	Marcia Ramos	2019-04-04	1	-6/+6
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a link to S3 Permission Scopes for registry object storage Closes #58881 See merge request gitlab-org/gitlab-ce!26067
\| \| * \| \| \| \| \|	Add a link to S3 Permission Scopes for registry object storage	Diana Stanley	2019-04-04	1	-6/+6
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'allow-to-use-untrusted-ruby-syntax' into 'master'	Sean McGivern	2019-04-04	9	-25/+223
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to use untrusted ruby syntax See merge request gitlab-org/gitlab-ce!26905
\| \| * \| \| \| \|	Allow to use untrusted Regexp via feature flag	Kamil Trzciński	2019-04-04	9	-25/+223
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This brings support for untrusted regexp for 'only:refs:' when enabled via feature flag: alllow_unsafe_ruby_regexp. This is by default disabled, and should not be used in production
\| * \| \| \| \|	Merge branch 'id-mr-list-when-filtered-by-approvers-only' into 'master'	Douglas Barbosa Alexandre	2019-04-04	5	-4/+64
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Consider array params on rendering MR list on dashboard See merge request gitlab-org/gitlab-ce!26623
\| \| * \| \| \| \|	Consider array params on rendering MR list on dashboard	Igor	2019-04-04	5	-4/+64
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes the bug, when approver filter is provided, but dashboard asks to enter any filter
* \| \| \| \| \|	Merge commit 'b99b6bb0960f749e1ba9a129be9c0365e306ed96' into 11-10-stable	John T Skarbek	2019-04-04	56	-300/+1029
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge branch '60029-fix-broken-master' into 'master'	Sean McGivern	2019-04-04	2	-2/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix an order-dependent spec failure in spec/migrations/schedule_sync_issuables_state_id_spec.rb Closes #60029 See merge request gitlab-org/gitlab-ce!26997
\| \| * \| \| \| \|	Fix an order-dependent spec failure in ↵	Nick Thomas	2019-04-04	2	-2/+2
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec/migrations/schedule_sync_issuables_state_id_spec.rb
\| * \| \| \| \|	Merge branch '38564-cant-leave-subgroup' into 'master'	James Lopez	2019-04-04	4	-4/+139
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change the way it is checked if the user is last group owner Closes #38564 See merge request gitlab-org/gitlab-ce!26718
\| \| * \| \| \|	Add cr remarks	Gosia Ksionek	2019-04-04	4	-4/+139
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Chnage method used in model to make it more efficient database-wise Add additional spec
\| * \| \| \|	Merge branch 'revert-4e045cd5' into 'master'error-pipelines-for-blocked-users	Annabel Dunstone Gray	2019-04-04	2	-6/+0
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'fix/missing-border' into 'master'" See merge request gitlab-org/gitlab-ce!26980
\| \| * \| \| \|	Revert "Merge branch 'fix/missing-border' into 'master'"revert-4e045cd5	Phil Hughes	2019-04-04	2	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !26242
\| * \| \| \| \|	Merge branch 'jprovazn-graphql-prometheus' into 'master'	Dmitriy Zaporozhets	2019-04-04	4	-0/+82
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Monitor GraphQL with Prometheus (try 2) See merge request gitlab-org/gitlab-ce!26917
\| \| * \| \| \|	Monitor GraphQL with Prometheus	Jan Provaznik	2019-04-04	4	-0/+82
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extends graphql's platform tracing class to observe duration of graphql methods. In graphql 1.8.11 is added prometheus class but it's not very useful for us because it uses prometheus_exporter to export results.
\| * \| \| \|	Merge branch 'rs-release-automation-danger' into 'master'	Yorick Peterse	2019-04-04	2	-15/+23
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exempt release automation MRs from Danger rules Closes gitlab-org/release/framework#269 See merge request gitlab-org/gitlab-ce!26993
\| \| * \| \| \|	Exempt release automation MRs from Danger rules	Robert Speicher	2019-04-04	2	-15/+23
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'osw-support-multi-line-suggestions' into 'master'	Douwe Maan	2019-04-04	36	-267/+755
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support multi-line suggestions Closes #53310 See merge request gitlab-org/gitlab-ce!25211
\| \| * \| \| \| \|	Fixed test specs	Oswaldo Ferreira	2019-04-04	36	-267/+755
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- added suggestions to mock data - fixed props to be not required
\| * \| \| \| \|	Merge branch 'ignore-merge-when-merge-pipelines-is-stale-ce' into 'master'	Kamil Trzciński	2019-04-04	1	-1/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport: Ignore merge if the status of the merge request pipeline is stale See merge request gitlab-org/gitlab-ce!26975
\| \| * \| \| \| \|	Ignore merge if the status of the merge request pipeline is staleignore-merge-when-merge-pipelines-is-stale-ce	Shinya Maeda	2019-04-04	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge request pipeline is meant for ensuring target branch's pipeline green. We should not let maintainers merge a merge request if the head pipeline of the merge request doesn't fulfill the criteria.
\| * \| \| \| \| \|	Merge branch 'webpack-memory-bump' into 'master'	Phil Hughes	2019-04-04	2	-5/+4
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix webpack dev-server crash caused by 1.5gb limit Closes #59075 See merge request gitlab-org/gitlab-ce!26849
\| \| * \| \| \| \|	Fix webpack dev-server crash due to memory limitwebpack-memory-bump	Simon Knox	2019-04-04	2	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unneeded var for webpack-prod call in gitlab-ci
\| * \| \| \| \| \|	Merge branch 'stop-signing-avatar-paths' into 'master'	Kamil Trzciński	2019-04-04	3	-0/+18
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up avatar URLs with object storage Closes #43065 See merge request gitlab-org/gitlab-ce!26858