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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Initial field and query complexity limits58405-basic-limiting-complexity-of-graphql-queries	Brett Walker	2019-04-04	4	-0/+75
\| \| \| \| \| \| \| \|	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.
*	Fixed test specs	Oswaldo Ferreira	2019-04-04	14	-166/+572
\| \| \| \| \|	- 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 'stop-signing-avatar-paths' into 'master'	Kamil Trzciński	2019-04-04	1	-0/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch '54417-graphql-type-authorization' into 'master'	Nick Thomas	2019-04-04	8	-76/+214
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GraphQL Type authorization Closes #54417 See merge request gitlab-org/gitlab-ce!25724
\| * \| \| \|	GraphQL Type authorization	Luke Duncalfe	2019-04-03	8	-76/+214
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \|	Filters branch and path labels for metrics	Ryan Cobb	2019-04-04	1	-0/+229
\| \| \| \| \|
* \| \| \| \|	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 '24704-download-repository-path' into 'master'	Kushal Pandya	2019-04-04	6	-18/+33
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Download a folder from repository Closes #24704 See merge request gitlab-org/gitlab-ce!26532
\| * \| \| \| \| \|	Make the dropdown match the design	Patrick Bajao	2019-04-02	4	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Regenerate locale.pot as well
\| * \| \| \| \| \|	Download a folder from repository	Patrick Bajao	2019-04-02	2	-13/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \|	Merge branch 'create-merge-pipelines-ce' into 'master'	Kamil Trzciński	2019-04-04	2	-24/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-24/+0
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes to CE
* \| \| \| \| \| \|	Merge branch 'backstage/gb/add-pipeline-bridge-presenter' into 'master'	Kamil Trzciński	2019-04-04	1	-0/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+15
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '55964-fix-email-encoding' into 'master'	Sean McGivern	2019-04-04	1	-0/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+13
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents `&mdash` in our templates being change to `-`
* \| \| \| \| \| \| \|	Merge branch 'add_backtrace_to_kubernetes_log' into 'master'	Sean McGivern	2019-04-04	5	-185/+81
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show backtrace when logging to kubernetes.log Closes #56768 See merge request gitlab-org/gitlab-ce!25726
\| * \| \| \| \| \| \| \|	Do not send error name and message to Sentry	Thong Kuah	2019-04-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's duplication information as we already send the full error object to Sentry.
\| * \| \| \| \| \| \| \|	Don't send error backtrace to Sentry	Thong Kuah	2019-04-04	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As it already has the full error sent to it
\| * \| \| \| \| \| \| \|	Refactor to share tests for base class method	Thong Kuah	2019-04-04	5	-203/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DRY up tests for logging error.
\| * \| \| \| \| \| \| \|	Show backtrace when logging to kubernetes.log	Thong Kuah	2019-04-04	4	-5/+24
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Just the error message and error class alone makes it hard to determine the full context of any errors, so we need to know where the error is occuring as well.
* \| \| \| \| \| \| \|	Expose head pipeline in the related merge requests	Alexandru Croitor	2019-04-04	5	-3/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose head pipeline for the MR in the api when requesting related merge requests for an issue and show a detailed status for the pipeline, which would include: details_path, favicon, group, icon, label, text, tooltip. https://gitlab.com/gitlab-org/gitlab-ce/issues/57662#note_152023412
* \| \| \| \| \| \| \|	Copy sidebar todo component from EE	Winnie Hellmann	2019-04-04	1	-1/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'support-time-windows-api' into 'master'	James Lopez	2019-04-04	4	-8/+121
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support time window parameters in additional metrics endpoint See merge request gitlab-org/gitlab-ce!26228
\| * \| \| \| \| \| \|	Specify time window for additional metrics apisupport-time-windows-api	syasonik	2019-04-03	4	-8/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds support for start and end parameters in the #additional_metrics endpoint of the EnvironmentsController. start and end are meant to be unix timestamps, per the Prometheus API (as the consumer of this endpoint will eventually be transitioned to a prometheus endpoint). This functionality is behind the :metrics_time_window feature flag for development.
* \| \| \| \| \| \| \|	Fix broken spec for Merge request > Revert modal	Douglas Barbosa Alexandre	2019-04-03	1	-2/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Include DAST as dependent CI template	Lucas Charles	2019-04-04	1	-1/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '29249-show-download-diff-even-when-merge-request-is-closed' ↵59323-legend-showing-nan-for-avg-max-when-they-are-fractional-quantities	Mike Greiling	2019-04-03	1	-19/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Show download diff even when merge request is closed" Closes #29249 See merge request gitlab-org/gitlab-ce!26772
\| * \| \| \| \| \| \| \|	Show Download diff links in closed MRs29249-show-download-diff-even-when-merge-request-is-closed	Fatih Acet	2019-04-03	1	-19/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Download MR diffs links were only available for open MRs, however it may still be useful for closed MRs.
* \| \| \| \| \| \| \| \|	Merge branch '13784-validate-variables-for-masking' into 'master'	Clement Ho	2019-04-03	5	-39/+109
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simple masking frontend - CE See merge request gitlab-org/gitlab-ce!26751
\| * \| \| \| \| \| \| \| \|	Add control for variable value masking	mfluharty	2019-03-29	5	-39/+109
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show masked switch for each variable When toggled on, the variable value will be masked in runner logs Show warning message if the switch is on but the value is not maskable
* \| \| \| \| \| \| \| \| \|	Merge branch '58644-remove-reply_to_individual_notes-feature-flag' into 'master'	Nick Thomas	2019-04-03	4	-138/+34
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove reply_to_individual_notes feature flag Closes #58644 See merge request gitlab-org/gitlab-ce!26889
\| * \| \| \| \| \| \| \| \|	Remove reply_to_individual_notes feature flag58644-remove-reply_to_individual_notes-feature-flag	Heinrich Lee Yu	2019-04-03	4	-138/+34
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also removes specs related to the flag
* \| \| \| \| \| \| \| \|	Merge branch 'feature/webide_escaping' of gitlab.com:hiddentiger/gitlab-ce ↵	Kieran Andrews	2019-04-03	2	-8/+22
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into feature/webide_escaping
* \| \| \| \| \| \| \|	Merge branch '52560-fix-duplicate-tag-system-hooks' into 'master'	Rémy Coutable	2019-04-03	1	-0/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only execute system hooks once when pushing tags Closes #52560 See merge request gitlab-org/gitlab-ce!26888
\| * \| \| \| \| \| \| \|	Only execute system hooks once when pushing tags	Nick Thomas	2019-04-03	1	-0/+14
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch '59756-shared-example-already-defined' into 'master'	Sean McGivern	2019-04-03	1	-85/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove already defined shared example Closes #59756 See merge request gitlab-org/gitlab-ce!26867
\| * \| \| \| \| \| \| \|	Remove already defined shared example59756-shared-example-already-defined	Alexandru Croitor	2019-04-02	1	-85/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing the time traking shared example as it was actually moved under time_tracking_quick_action_shared_examples.rb filename to a different path as part of spec refactorign for quick action https://gitlab.com/gitlab-org/gitlab-ce/issues/50199 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26095
* \| \| \| \| \| \| \| \|	Add port section to CI Image object	Francisco Javier López	2019-04-03	13	-15/+703
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order to implement https://gitlab.com/gitlab-org/gitlab-ee/issues/10179 we need several modifications on the CI config file. We are adding a new ports section in the default Image object. Each of these ports will accept: number, protocol and name. By default this new configuration will be only enabled in the Web IDE config file.
* \| \| \| \| \| \| \| \|	Merge branch '55268-exclude-system-notes-from-commits-in-mr' into 'master'	Rémy Coutable	2019-04-03	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not show system notes on commits in the MR page Closes #55268 See merge request gitlab-org/gitlab-ce!26396
\| * \| \| \| \| \| \| \|	Do not show system notes on commits in the MR page55268-exclude-system-notes-from-commits-in-mr	Heinrich Lee Yu	2019-04-02	1	-0/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '47234-composable-auto-devops' into 'master'	Dmitriy Zaporozhets	2019-04-03	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Composable Auto DevOps" Closes #47234 See merge request gitlab-org/gitlab-ce!26520