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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Rename environment variable EE to IS_GITLAB_EEwinh-ee-environment-variable	Winnie Hellmann	2019-04-05	3	-6/+6
\|
*	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 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
\| * \| \| \| \| \|	Speed up avatar URLs with object storage	Sean McGivern	2019-04-04	3	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With object storage enabled, calling `#filename` on an upload does this: 1. Call the `#filename` method on the CarrierWave object. 2. Generate the URL for that object. 3. If the uploader isn't public, do so by generating an authenticated URL, including signing that request. That's all correct behaviour, but for the case where we use `#filename`, it's typically to generate a GitLab URL. That URL doesn't need to be signed because we do our own auth. Signing the URLs can be very expensive, especially in batch (say, we need to get the avatar URLs for 150 users in one request). It's all unnecessary work. If we used the `RecordsUploads` concern, we have already recorded a `path` in the database. That `path` is actually generated from CarrierWave's `#filename` at upload time, so we don't need to recompute it - we can just use it and strip off the prefix if it's available. On a sample users autocomplete URL, at least 10% of the time before this change went to signing URLs. After this change, we spend no time in URL signing, and still get the correct results.
* \| \| \| \| \| \|	Merge branch 'dz-reserve-v2-root-path' into 'master'	Grzegorz Bizon	2019-04-04	4	-1/+30
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add v2 to reserved top level routes See merge request gitlab-org/gitlab-ce!26540
\| * \| \| \| \| \| \|	Add v2 to reserved top level routesdz-reserve-v2-root-path	Dmitriy Zaporozhets	2019-04-04	4	-1/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch '54417-graphql-type-authorization' into 'master'	Nick Thomas	2019-04-04	21	-167/+457
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GraphQL Type authorization Closes #54417 See merge request gitlab-org/gitlab-ce!25724
\| * \| \| \| \| \| \|	Added documentation for GraphQL Type authorization54417-graphql-type-authorization	Luke Duncalfe	2019-04-03	1	-32/+108
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	GraphQL Type authorization	Luke Duncalfe	2019-04-03	20	-135/+349
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enables authorizations to be defined on GraphQL Types. module Types class ProjectType < BaseObject authorize :read_project end end If a field has authorizations defined on it, and the return type of the field also has authorizations defined on it. then all of the combined permissions in the authorizations will be checked and must pass. Connection fields are checked by "digging" to find the type class of the "node" field in the expected location of edges->node. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54417
* \| \| \| \| \| \| \|	Merge branch 'ml-add-testing-to-feature-proposal-template-docs' into 'master'	Rémy Coutable	2019-04-04	1	-0/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add testing to feature proposal template See merge request gitlab-org/gitlab-ce!26779
\| * \| \| \| \| \| \| \|	Add testing to feature proposal template	Mark Lapierre	2019-04-04	1	-0/+4
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '48090-filter-sensitive-metric-labels' into 'master'	Dmitriy Zaporozhets	2019-04-04	3	-3/+246
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filters branch and path labels for metrics Closes #48090 See merge request gitlab-org/gitlab-ce!26744
\| * \| \| \| \| \| \| \|	Filters branch and path labels for metrics	Ryan Cobb	2019-04-04	3	-3/+246
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '59570-tag-quick-action' into 'master'	Sean McGivern	2019-04-04	2	-22/+25
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move tag quick action spec to shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26904
\| * \| \| \| \| \| \| \|	Move tag quick action spec to shared example59570-tag-quick-action	Alexandru Croitor	2019-04-03	2	-22/+25
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '59570-merge-quick-action' into 'master'	Sean McGivern	2019-04-04	2	-68/+49
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract merge quick action to a shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26925
\| * \| \| \| \| \| \| \| \|	Extract merge quick action to a shared example59570-merge-quick-action	Alexandru Croitor	2019-04-03	2	-68/+49
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/work-around-no-html-lists-in-tables' into 'master'	Achilleas Pipinellis	2019-04-04	1	-14/+14
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Work around lack of HTML list support in topic Closes #59338 See merge request gitlab-org/gitlab-ce!26964
\| * \| \| \| \| \| \| \| \| \|	Work around lack of HTML list support in topic	Evan Read	2019-04-04	1	-14/+14
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '24704-download-repository-path' into 'master'	Kushal Pandya	2019-04-04	22	-68/+141
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Download a folder from repository Closes #24704 See merge request gitlab-org/gitlab-ce!26532
\| * \| \| \| \| \| \| \| \| \|	Add download_links partial to DRY up a bit24704-download-repository-path	Patrick Bajao	2019-04-04	2	-18/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update gitaly and workhorse version to stable	Patrick Bajao	2019-04-02	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't translate file extensions	Patrick Bajao	2019-04-02	2	-20/+8
\| \| \| \| \| \| \| \| \| \| \|