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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use existing classes for display inline content	Patrick Bajao	2019-04-02	2	-14/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update GITALY_SERVER_VERSION to master	Patrick Bajao	2019-04-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The gitaly branch has been merged to master and deleted so need to use master for now until a release gets out.
\| * \| \| \| \| \| \| \| \|	Switch positions of source and directory sections	Patrick Bajao	2019-04-02	3	-17/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated the documentation to match the updated order including the screenshot.
\| * \| \| \| \| \| \| \| \|	Add documentation for download source code feature	Patrick Bajao	2019-04-02	2	-0/+20
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make the dropdown match the design	Patrick Bajao	2019-04-02	7	-54/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Regenerate locale.pot as well
\| * \| \| \| \| \| \| \| \|	Download a folder from repository	Patrick Bajao	2019-04-02	14	-40/+97
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `GetArchiveRequest` to git-archive params. Modifies `Git::Repository#archive_metadata` to append `path` to `ArchivePrefix` so it'll not hit the cache of repository archive when it already exists.
\| * \| \| \| \| \| \| \| \|	Add download directory in menu	Kia Mei Somabes	2019-04-02	4	-2/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add subdirectory params for RepositoriesController#archive
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Achilleas Pipinellis	2019-04-04	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'59979-update-documentation-about-only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds-to-take-into-account-the-settings-page-reorganization' into 'master' Update "Pipelines must succeed" documentation Closes #59979 See merge request gitlab-org/gitlab-ce!26945
\| * \| \| \| \| \| \| \| \|	Update "Pipelines must succeed" docs59979-update-documentation-about-only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds-to-take-into-account-the-settings-page-reorganization	Nathan Friend	2019-04-03	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit updates the documentation about the "Pipelines must succeed" checkbox.
* \| \| \| \| \| \| \| \| \|	Merge branch 'create-merge-pipelines-ce' into 'master'	Kamil Trzciński	2019-04-04	3	-33/+11
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport: Use merge request MERGE ref for attached merge request pipelines See merge request gitlab-org/gitlab-ce!26702
\| * \| \| \| \| \| \| \| \| \|	Backport attached merge request pipelinescreate-merge-pipelines-ce	Shinya Maeda	2019-04-04	3	-33/+11
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes to CE
* \| \| \| \| \| \| \| \| \|	Merge branch 'backstage/gb/add-pipeline-bridge-presenter' into 'master'	Kamil Trzciński	2019-04-04	2	-0/+24
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add pipeline bridge presenter See merge request gitlab-org/gitlab-ce!26911
\| * \| \| \| \| \| \| \| \| \|	Add pipeline bridge presenterbackstage/gb/add-pipeline-bridge-presenter	Grzegorz Bizon	2019-04-03	2	-0/+24
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '55964-fix-email-encoding' into 'master'	Sean McGivern	2019-04-04	3	-1/+20
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent premailer from replacing HTML entities Closes #55964 See merge request gitlab-org/gitlab-ce!26931
\| * \| \| \| \| \| \| \| \| \| \|	Prevent premailer from converting HTML entities	Heinrich Lee Yu	2019-04-04	3	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents `&mdash` in our templates being change to `-`
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '3314-add-on-runner-minutes-for-gitlab-com-ce' into 'master'	Douwe Maan	2019-04-04	5	-0/+11
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport some changes from gitlab-ee!9815 Closes #3314 See merge request gitlab-org/gitlab-ce!25908
\| * \| \| \| \| \| \| \| \| \| \| \|	Backport some changes from EE3314-add-on-runner-minutes-for-gitlab-com-ce	Rubén Dávila	2019-04-02	5	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9815