f0212cd32b
Update Clair Version V8 to V11
2019-07-10 10:46:47 +00:00
1ed911ada0
Merge branch 'i18n-projects-new' into 'master'
...
Externalize strings of page '/projects/new'
See merge request gitlab-org/gitlab-ce!30447
2019-07-10 10:25:44 +00:00
c9f63f272f
Some improvement about text translation
...
Fix symbol '&' display.
Remove unnecessary calls of `.html_safe`
2019-07-10 10:25:43 +00:00
0cd59a756c
Merge branch 'rs-config-parity' into 'master'
...
Copy EE-only config files to CE
See merge request gitlab-org/gitlab-ce!30529
2019-07-10 09:09:30 +00:00
4531879062
Merge branch 'winh-notes-service-toggleAward' into 'master'
...
Remove toggleAward from notes service
See merge request gitlab-org/gitlab-ce!30536
2019-07-10 07:43:46 +00:00
560d8bcc59
Remove toggleAward from notes service
2019-07-10 07:43:45 +00:00
f39b783385
Merge branch 'docs/improve-version-notes-for-pages' into 'master'
...
Tidy up version notes for Pages documentation
See merge request gitlab-org/gitlab-ce!30548
2019-07-10 07:33:52 +00:00
cc144cd112
Tidy up version notes for Pages documentation
2019-07-10 07:33:51 +00:00
b929fc033b
Merge branch 'mf-modal-style-footer-button-spacing' into 'master'
...
Reduce margin between modal footer buttons
See merge request gitlab-org/gitlab-ce!30428
2019-07-10 07:19:08 +00:00
594a4796bc
Reduce margin between modal footer buttons
...
Set margin to 0 except left margin on any button after another button
Now matches the 8px from the design spec
2019-07-10 07:19:07 +00:00
92b0d7e09b
Merge branch '10009-boards' into 'master'
...
Moves EE differences for issue boards
See merge request gitlab-org/gitlab-ce!30461
2019-07-10 07:18:15 +00:00
755ff7e45c
Moves EE differences for issue boards
2019-07-10 07:18:14 +00:00
d4fb9a55ca
Merge branch 'caneldem-master-patch-77839' into 'master'
...
Propagate python version variable
See merge request gitlab-org/gitlab-ce!30519
2019-07-10 06:27:19 +00:00
bee24c85c0
Propagate python version variable
2019-07-10 06:27:18 +00:00
810df4fb51
Merge branch '62826-graphql-note-mutations' into 'master'
...
GraphQL mutations for managing Notes
See merge request gitlab-org/gitlab-ce!30210
2019-07-10 05:52:18 +00:00
227d8b4445
Merge branch '58275-rename-project-entity' into 'master'
...
Rename ProjectEntity to IssuableEntity
Closes #58275
See merge request gitlab-org/gitlab-ce!30217
2019-07-10 05:39:44 +00:00
713cc99abc
Merge branch 'qa/be-explicit-when-fabricating-resources-via-api' into 'master'
...
Make tests explicitly fabricate resources via the API
See merge request gitlab-org/gitlab-ce!30515
2019-07-10 04:53:57 +00:00
8a33f51d2f
Merge branch 'docs/update-project-api' into 'master'
...
Include merge method link in attribute description
Closes #64282
See merge request gitlab-org/gitlab-ce!30492
2019-07-10 03:08:16 +00:00
275f37030f
Include merge method link in attribute description
...
Currently, the project visibility methods attribute description link to
the descriptions and options for visibility methods. The merge methods
attribute description doesn't should do the same.
2019-07-10 03:08:15 +00:00
9e0a66c4f1
Merge branch 'docs-siegerts-fix-typo' into 'master'
...
Docs: fix typo
See merge request gitlab-org/gitlab-ce!30505
2019-07-10 02:28:19 +00:00
073c8b25ea
GraphQL support for Notes created in discussions
...
A new `discussion_id` argument on the `createNote` mutation allows
people to create a note within that discussion.
The ability to lazy-load Discussions has been added, so
GraphQL.object_from_id can treat Discussions the same as AR objects and
batch load them.
https://gitlab.com/gitlab-org/gitlab-ce/issues/62826
https://gitlab.com/gitlab-org/gitlab-ee/issues/9489
2019-07-10 12:13:48 +12:00
254f78f5dc
Expose diff_refs on MergeRequestType
...
https://gitlab.com/gitlab-org/gitlab-ee/issues/9489
2019-07-10 12:13:48 +12:00
a00a23ca82
GraphQL mutations for managing Notes
...
https://gitlab.com/gitlab-org/gitlab-ce/issues/62826
2019-07-10 12:13:47 +12:00
42e876b7c0
Merge branch '64066-fix-uneven-click-areas' into 'master'
...
Fix uneven click areas in toast actions
Closes #64066
See merge request gitlab-org/gitlab-ce!30345
2019-07-09 23:33:54 +00:00
ac9c3add5b
Fix toast spacing issues
...
Fixed the toast spacing issues
2019-07-09 23:33:54 +00:00
ee1cffcf54
Merge branch 'add-15m-bucket-for-ci-queue' into 'master'
...
Adds 15m bucket for CI job queue
See merge request gitlab-org/gitlab-ce!30525
2019-07-09 22:53:33 +00:00
572c89874b
Adds 15m bucket for CI job queue
2019-07-09 22:53:32 +00:00
b9b6022492
Merge branch 'qa-autodevops-rotate-gcp-zones' into 'master'
...
Allow specificity for GKE Cluster Location
See merge request gitlab-org/gitlab-ce!30490
2019-07-09 22:41:38 +00:00
60decd4709
Merge branch 'patch-72-docs' into 'master'
...
Add documentation for customizing the auto-deploy-app helm chart by setting `HELM_UPGRADE_EXTRA_ARGS` to `--values my-values.yaml`
See merge request gitlab-org/gitlab-ce!30371
2019-07-09 21:52:40 +00:00
306c8caa2c
Merge branch 'fix-unicorn-sampler-workers-count' into 'master'
...
Make unicorn_workers to return meaningful results
Closes #63659
See merge request gitlab-org/gitlab-ce!30506
2019-07-09 21:34:03 +00:00
af7c98044e
Allow specificity for GKE Cluster Location
...
Use GCLOUD_REGION over GCLOUD_ZONE.
Using REGION over ZONE provides more of a
guarantee of cluster size, and dist-
ributes between a region's zones
2019-07-09 14:31:01 -07:00
109956a65b
Merge branch 'project_api' into 'master'
...
Improve Project API
Closes #49938 , #40892 , and #35992
See merge request gitlab-org/gitlab-ce!28327
2019-07-09 20:09:45 +00:00
f6337857ca
Apply suggestion to doc/topics/autodevops/index.md
2019-07-09 20:06:18 +00:00
6e106f66ad
Merge branch 'nfriend-add-delay-support-to-tooltip-js' into 'master'
...
Add delay customization to `app/assets/javascripts/vue_shared/directives/tooltip.js`
See merge request gitlab-org/gitlab-ce!30524
2019-07-09 19:44:20 +00:00
cd5117593f
Merge branch 'jc-disable-can-use-disk-temp' into 'master'
...
Disabling can_use_disk? temporarily
See merge request gitlab-org/gitlab-ce!30526
2019-07-09 19:43:29 +00:00
b2ecc8098a
Merge branch 'osw-bypass-push-rules-for-merge-to-ref' into 'master'
...
[CE port] Bypass push rules for merge to ref service
See merge request gitlab-org/gitlab-ce!30426
2019-07-09 19:20:27 +00:00
5305d5267d
Disabling can_use_disk? temporarily
2019-07-09 11:14:57 -07:00
2615265ef8
Merge branch 'master' into sathieu/gitlab-ce-project_api
2019-07-09 14:45:46 -03:00
48c19d9e29
Merge branch '63945-update-mixin-deep-to-1.3.2' into 'master'
...
Update mixin-deep to 1.3.2
Closes #63945
See merge request gitlab-org/gitlab-ce!30223
2019-07-09 17:40:28 +00:00
e396f0bacb
Merge branch 'ce-10609-system-notes-scoped-labels' into 'master'
...
Port of "Create system notes for scoped labels"
See merge request gitlab-org/gitlab-ce!30250
2019-07-09 17:39:24 +00:00
84dd31493e
[CE port] Bypass push rules for merge to ref service
...
Turns out push rules to validate commit message does
not apply in the context of automatic merge to
the refs/merge-requests/:iid/merge. Mainly because
if it fails to merge to it, we currently can't give enough
preemptive feedback to the user and it'll turn the
merge request unmergeable (given we automatically
mark it as unmergeable if we can't merge to the ref).
In general, it's a systematic operation, which already
bypasses user authorization and git hooks.
Therefore, this commit makes it bypass the push rules
at EE as well.
2019-07-09 14:36:29 -03:00
d1c86dc985
Copy EE-only config files to CE
...
These aren't used in CE, but it's safe to include them.
2019-07-09 12:13:59 -05:00
db04a18d7d
CE-EE parity for shared config files
...
This copies over EE-specific changes to shared configuration files in
CE.
2019-07-09 12:13:21 -05:00
ee3fc6d627
Merge branch 'update-net-ssh' into 'master'
...
Update net-ssh gem to ~> 5.2
See merge request gitlab-org/gitlab-ce!30341
2019-07-09 16:56:18 +00:00
0b92417452
Merge branch 'jramsay/enable-object-dedupe-by-default' into 'master'
...
Enable repository object pools by default
Closes gitaly#1606
See merge request gitlab-org/gitlab-ce!29595
2019-07-09 16:52:04 +00:00
6d3fede0af
Merge branch 'sh-redact-redis-perf-bar' into 'master'
...
Perform more redactions in Redis performance bar traces
Closes #64309
See merge request gitlab-org/gitlab-ce!30514
2019-07-09 16:27:05 +00:00
9c55031ff7
Add delay customization to tooltip.js
...
This MR allows the delay of tooltips instantiated using
tooltip.js to be customized through localStorage.
2019-07-09 13:25:00 -03:00
10576b2b3b
Merge branch 'negative-commit-message-push-rule-docs' into 'master'
...
Negative commit message push rule docs
See merge request gitlab-org/gitlab-ce!30521
2019-07-09 16:09:51 +00:00
ab6228eafb
Merge branch 'docs/63603-update-project-import-export-docs-to-include-what-exactly-is-imported-exported' into 'master'
...
Resolve "Update project import/export docs to include what exactly is imported/exported"
Closes #63603
See merge request gitlab-org/gitlab-ce!29987
2019-07-09 16:06:49 +00:00
a215c8ece9
Resolve "Update project import/export docs to include what exactly is imported/exported"
2019-07-09 16:06:48 +00:00
Can Eldem
Bob Van Landuyt
antony liu
Lin Jen-Shin
Kushal Pandya
Winnie Hellmann
Marcia Ramos
Evan Read
Phil Hughes
Miranda Fluharty
Filipa Lacerda
James Lopez
Jan Provaznik
Sanad Liaquat
Cindy Pallares 🦉
Luke Duncalfe
Fatih Acet
Jacques Erasmus
Kamil Trzciński
Elliot Rushton
Dan Davison
Thong Kuah
Stan Hu
Douglas Barbosa Alexandre
nathanbietz
John Cai
Mike Greiling
Oswaldo Ferreira
Robert Speicher
Nick Thomas
Sean McGivern
Nathan Friend
Ray Paik
Achilleas Pipinellis
Michael Leopard