summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Moves EE differences for issue boardsFilipa Lacerda2019-07-103-14/+21
|
* Merge branch 'caneldem-master-patch-77839' into 'master'James Lopez2019-07-102-0/+6
|\ | | | | | | | | Propagate python version variable See merge request gitlab-org/gitlab-ce!30519
| * Propagate python version variableCan Eldem2019-07-102-0/+6
|/
* Merge branch '62826-graphql-note-mutations' into 'master'Jan Provaznik2019-07-1036-10/+869
|\ | | | | | | | | GraphQL mutations for managing Notes See merge request gitlab-org/gitlab-ce!30210
| * GraphQL support for Notes created in discussions62826-graphql-note-mutationsLuke Duncalfe2019-07-1011-2/+160
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * Expose diff_refs on MergeRequestTypeLuke Duncalfe2019-07-107-11/+30
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/issues/9489
| * GraphQL mutations for managing NotesLuke Duncalfe2019-07-1021-1/+683
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/62826
* | Merge branch '58275-rename-project-entity' into 'master'Jan Provaznik2019-07-102-5/+5
|\ \ | | | | | | | | | | | | | | | | | | Rename ProjectEntity to IssuableEntity Closes #58275 See merge request gitlab-org/gitlab-ce!30217
| * | Rename ProjectEntity to IssuableEntity58275-rename-project-entityAlexandru Croitor2019-07-092-5/+5
| | |
* | | Merge branch 'qa/be-explicit-when-fabricating-resources-via-api' into 'master'Sanad Liaquat2019-07-102-4/+4
|\ \ \ | | | | | | | | | | | | | | | | Make tests explicitly fabricate resources via the API See merge request gitlab-org/gitlab-ce!30515
| * | | Make tests explicitly fabricate resources via APIqa/be-explicit-when-fabricating-resources-via-apiWalmyr Lima2019-07-092-4/+4
| | | |
* | | | Merge branch 'docs/update-project-api' into 'master'Evan Read2019-07-101-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include merge method link in attribute description Closes #64282 See merge request gitlab-org/gitlab-ce!30492
| * | | | Include merge method link in attribute descriptionCindy Pallares 🦉2019-07-101-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'docs-siegerts-fix-typo' into 'master'63197-move-chart-alerts-into-dropdown-menuEvan Read2019-07-101-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Docs: fix typo See merge request gitlab-org/gitlab-ce!30505
| * | | typo fixdocs-siegerts-fix-typosiegerts2019-07-091-1/+1
| | | |
* | | | Merge branch '64066-fix-uneven-click-areas' into 'master'Fatih Acet2019-07-093-8/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix uneven click areas in toast actions Closes #64066 See merge request gitlab-org/gitlab-ce!30345
| * | | | Fix toast spacing issuesJacques Erasmus2019-07-093-8/+11
|/ / / / | | | | | | | | | | | | Fixed the toast spacing issues
* | | | Merge branch 'add-15m-bucket-for-ci-queue' into 'master'Kamil Trzciński2019-07-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Adds 15m bucket for CI job queue See merge request gitlab-org/gitlab-ce!30525
| * | | | Adds 15m bucket for CI job queueElliot Rushton2019-07-091-1/+1
|/ / / /
* | | | Merge branch 'qa-autodevops-rotate-gcp-zones' into 'master'Dan Davison2019-07-092-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow specificity for GKE Cluster Location See merge request gitlab-org/gitlab-ce!30490
| * | | | Allow specificity for GKE Cluster Locationqa-autodevops-rotate-gcp-zonesddavison2019-07-092-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch 'patch-72-docs' into 'master'Thong Kuah2019-07-091-4/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Apply suggestion to doc/topics/autodevops/index.mdnathanbietz2019-07-091-1/+0
| | | | | |
| * | | | | Merge branch 'master' into 'patch-72-docs'nathanbietz2019-07-09588-5323/+7722
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # doc/topics/autodevops/index.md
| * | | | | | Apply suggestion to doc/topics/autodevops/index.mdnathanbietz2019-07-091-1/+1
| | | | | | |
| * | | | | | Apply suggestion to doc/topics/autodevops/index.mdnathanbietz2019-07-091-1/+1
| | | | | | |
| * | | | | | Apply suggestion to doc/topics/autodevops/index.mdnathanbietz2019-07-091-1/+1
| | | | | | |
| * | | | | | Apply suggestion to doc/topics/autodevops/index.mdnathanbietz2019-07-091-1/+1
| | | | | | |
| * | | | | | Apply suggestion to doc/topics/autodevops/index.mdnathanbietz2019-07-091-1/+1
| | | | | | |
| * | | | | | Update index.md.... change "helm deploy" to "helm upgrade"nathanbietz2019-07-041-1/+1
| | | | | | |
| * | | | | | Update index.md.... add instructions on how to add a `values.yaml` override ↵nathanbietz2019-07-041-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | file to the default auto-deploy-app helm chart by setting `HELM_UPGRADE_EXTRA_ARGS` to `--values my-values.yaml` (or `-f my-values.yaml`).
* | | | | | | Merge branch 'fix-unicorn-sampler-workers-count' into 'master'Stan Hu2019-07-093-11/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make unicorn_workers to return meaningful results Closes #63659 See merge request gitlab-org/gitlab-ce!30506
| * | | | | | | Make unicorn_workers to return meaningful resultsfix-unicorn-sampler-workers-countKamil Trzciński2019-07-093-11/+38
| | | | | | | |
* | | | | | | | Merge branch 'project_api' into 'master'Douglas Barbosa Alexandre2019-07-0911-35/+304
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve Project API Closes #49938, #40892, and #35992 See merge request gitlab-org/gitlab-ce!28327
| * \ \ \ \ \ \ \ Merge branch 'master' into sathieu/gitlab-ce-project_apiDouglas Barbosa Alexandre2019-07-09834-7310/+11484
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Reduce changes to doc/api/projects.mdproject_apiNick Thomas2019-07-041-62/+69
| | | | | | | | | |
| * | | | | | | | | Update json for "Get single project" docMathieu Parent2019-07-031-69/+62
| | | | | | | | | |
| * | | | | | | | | Fix API performance problem of auto_devops queryMathieu Parent2019-07-031-0/+2
| | | | | | | | | |
| * | | | | | | | | Add changelog entryMathieu Parent2019-07-031-0/+5
| | | | | | | | | |
| * | | | | | | | | Add auto_devops_* to project APIMathieu Parent2019-07-036-2/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The auto_devops object sometimes doesn't exists. We may need to create it.
| * | | | | | | | | Add auto_cancel_pending_pipelines to project APIMathieu Parent2019-07-033-0/+6
| | | | | | | | | |
| * | | | | | | | | Add build_coverage_regex to project APIMathieu Parent2019-07-033-0/+6
| | | | | | | | | |
| * | | | | | | | | Add build_timeout to project APIMathieu Parent2019-07-033-0/+6
| | | | | | | | | |
| * | | | | | | | | Add build_git_strategy attribute to project APIMathieu Parent2019-07-037-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We map the boolean to the string 'fetch' or 'clone', to be more explicit.
| * | | | | | | | | Add *_access_level to project APIMathieu Parent2019-07-037-35/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - issues_access_level - repository_access_level - merge_requests_access_level - builds_access_level - wiki_access_level - snippets_access_level
* | | | | | | | | | Merge branch 'nfriend-add-delay-support-to-tooltip-js' into 'master'Fatih Acet2019-07-091-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add delay customization to `app/assets/javascripts/vue_shared/directives/tooltip.js` See merge request gitlab-org/gitlab-ce!30524
| * | | | | | | | | | Add delay customization to tooltip.jsnfriend-add-delay-support-to-tooltip-jsNathan Friend2019-07-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR allows the delay of tooltips instantiated using tooltip.js to be customized through localStorage.
* | | | | | | | | | | Merge branch 'jc-disable-can-use-disk-temp' into 'master'Stan Hu2019-07-092-11/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling can_use_disk? temporarily See merge request gitlab-org/gitlab-ce!30526
| * | | | | | | | | | | Disabling can_use_disk? temporarilyJohn Cai2019-07-092-11/+14
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'osw-bypass-push-rules-for-merge-to-ref' into 'master'Stan Hu2019-07-095-17/+42
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE port] Bypass push rules for merge to ref service See merge request gitlab-org/gitlab-ce!30426