summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Apply code review changesgeorgekoltsov/64311-set-visibility-private-if-internal-restrictedGeorge Koltsov2019-07-173-6/+4
|
* Add changelog entryGeorge Koltsov2019-07-163-4/+22
|
* Add imported project internal visibility specGeorge Koltsov2019-07-101-0/+14
|
* Set Private visibility for restricted Internal imported projectsGeorge Koltsov2019-07-101-0/+1
| | | | | | | | | With https://gitlab.com/gitlab-org/gitlab-ee/issues/12388 change going live there is potential risk of breaking imports of 'Internal' projects. This change makes sure if 'Internal' visibility level is restricted all 'Internal' projects will be marked as 'Private' See: https://gitlab.com/gitlab-org/gitlab-ce/issues/64311
* Merge branch 'rs-config-parity' into 'master'Lin Jen-Shin2019-07-107-1/+643
|\ | | | | | | | | Copy EE-only config files to CE See merge request gitlab-org/gitlab-ce!30529
| * Copy EE-only config files to CErs-config-parityRobert Speicher2019-07-094-0/+613
| | | | | | | | These aren't used in CE, but it's safe to include them.
| * CE-EE parity for shared config filesRobert Speicher2019-07-093-1/+30
| | | | | | | | | | This copies over EE-specific changes to shared configuration files in CE.
* | Merge branch 'winh-notes-service-toggleAward' into 'master'Kushal Pandya2019-07-103-9/+8
|\ \ | | | | | | | | | | | | Remove toggleAward from notes service See merge request gitlab-org/gitlab-ce!30536
| * | Remove toggleAward from notes serviceWinnie Hellmann2019-07-103-9/+8
|/ /
* | Merge branch 'docs/improve-version-notes-for-pages' into 'master'Marcia Ramos2019-07-101-10/+13
|\ \ | | | | | | | | | | | | Tidy up version notes for Pages documentation See merge request gitlab-org/gitlab-ce!30548
| * | Tidy up version notes for Pages documentationEvan Read2019-07-101-10/+13
|/ /
* | Merge branch 'mf-modal-style-footer-button-spacing' into 'master'Phil Hughes2019-07-101-0/+4
|\ \ | | | | | | | | | | | | Reduce margin between modal footer buttons See merge request gitlab-org/gitlab-ce!30428
| * | Reduce margin between modal footer buttonsMiranda Fluharty2019-07-101-0/+4
|/ / | | | | | | | | Set margin to 0 except left margin on any button after another button Now matches the 8px from the design spec
* | Merge branch '10009-boards' into 'master'Phil Hughes2019-07-103-14/+21
|\ \ | | | | | | | | | | | | Moves EE differences for issue boards See merge request gitlab-org/gitlab-ce!30461
| * | 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
| | | | | | | | | | |