summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update tense on compute sectiondocs-app-dev-platformDaniel Gruesso2019-06-181-1/+1
|
* Apply suggestion to doc/topics/application_development_platform/index.mdDaniel Gruesso2019-06-181-1/+1
|
* Apply suggestion to doc/topics/application_development_platform/index.mdDaniel Gruesso2019-06-181-1/+1
|
* Apply suggestion to doc/topics/application_development_platform/index.mdDaniel Gruesso2019-06-181-1/+1
|
* Apply suggestion to doc/topics/application_development_platform/index.mdDaniel Gruesso2019-06-181-1/+1
|
* Apply suggestion to doc/topics/application_development_platform/index.mdMike Lewis2019-06-181-2/+2
|
* Edit build test deploy sectionMike Lewis2019-06-181-3/+3
|
* Update doc overviewMike Lewis2019-06-181-2/+2
|
* First draft of app dev platform pagedanielgruesso2019-06-171-0/+53
|
* Merge branch '58886-issue-tracker-fields' into 'master'Sean McGivern2019-06-1713-0/+246
|\ | | | | | | | | Create models for issue trackers data See merge request gitlab-org/gitlab-ce!28598
| * Create models for issue trackers data58886-issue-tracker-fieldsJarka Košanová2019-06-1313-0/+246
| | | | | | | | | | - create tables for storing issue trackers properties - add model and basic logic & spec
* | Merge branch 'docs-ide-file-sync' into 'master'Marcia Ramos2019-06-172-0/+59
|\ \ | | | | | | | | | | | | Docs for Web IDE file sync See merge request gitlab-org/gitlab-ce!29638
| * | Docs for Web IDE file syncPaul Slaughter2019-06-172-0/+59
|/ /
* | Merge branch 'docs-merge-trains' into 'master'Marcia Ramos2019-06-175-2/+71
|\ \ | | | | | | | | | | | | Docs for Merge Trains See merge request gitlab-org/gitlab-ce!29047
| * | Docs for Merge Trainsdocs-merge-trainsShinya Maeda2019-06-175-2/+71
| | | | | | | | | | | | | | | It explains what is Merge Trains, how to enalbe it and its limitations.
* | | Merge branch 'issue-58747' into 'master'Nick Thomas2019-06-173-8/+99
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix GPG signature verification with recent versions of GnuPG Closes #58747 See merge request gitlab-org/gitlab-ce!29388
| * | | Fix GPG signature verification with recent versions of GnuPGDavid Palubin2019-06-173-8/+99
|/ / /
* | | Merge branch '30138-display-cycle-analytics-issue-logic-fixes' into 'master'James Lopez2019-06-1732-164/+379
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Display and logic improvements for cycle analytics" Closes #30138 See merge request gitlab-org/gitlab-ce!29018
| * | | Fix plan stage queryGosia Ksionek2019-06-1732-164/+379
|/ / / | | | | | | | | | Fix plan stage query and the way it is displayed
* | | Merge branch '9490-record-repository_type-on-lfs_objects_projects-ce' into ↵Grzegorz Bizon2019-06-1714-15/+140
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE backport for gitlab-ee!13894 (Save repository_type to LfsObjectsProject) See merge request gitlab-org/gitlab-ce!29179
| * | | CE backport for changes in EE MR 138949490-record-repository_type-on-lfs_objects_projects-ceLuke Duncalfe2019-06-1714-15/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports to CE changes that allow the recording of the repository_type in the table lfs_objects_projects. This is in order to allow future pruning of unreferenced LFS objects, as we will need to know which repository to look in for the LFS pointer file. The EE MR that contains the original code and a full explanation of the changes is https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894 EE Issue https://gitlab.com/gitlab-org/gitlab-ee/issues/9490 Note that there was a lot of CE code changed in the EE MR because we want to allow the wiki repository to also use LFS. See https://gitlab.com/gitlab-org/gitlab-ce/issues/43721. As the wiki is an unlicensed feature, a full backport is required to enable this.
* | | | Merge branch 'error-pipelines-for-blocked-users' into 'master'Grzegorz Bizon2019-06-1720-45/+106
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preventing blocked users and their PipelineSchdules from creating new Pipelines Closes #47756 See merge request gitlab-org/gitlab-ce!27318
| * | | | preventing blocked users and their PipelineSchdules from creating new Pipelinesdrew cimino2019-06-0420-45/+106
| | | | | | | | | | | | | | | | | | | | updated several specs and factories to accomodate new permissions
* | | | | Merge branch 'docs/turn-single-line-code-into-blocks' into 'master'62873-add-simplest-happy-path-end-to-end-test-of-monitor-featureSanad Liaquat2019-06-171-3/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn single line code into blocks to improve documentation readability Closes #62506 See merge request gitlab-org/gitlab-ce!29693
| * | | | | Turn single line code into blocksWalmyr2019-06-171-3/+15
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | To improve doc readability. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62506
* | | | | Merge branch 'master-i18n' into 'master'Bob Van Landuyt2019-06-1745-71/+1556
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Master i18n See merge request gitlab-org/gitlab-ce!29723
| * | | | | New translations from CrowdinLuke Bennett2019-06-1745-71/+1556
|/ / / / /
* | | | | Merge branch 'container-registry-api-perms-58271' into 'master'Kamil Trzciński2019-06-176-10/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Align Container Registry API Delete Permissions with UI See merge request gitlab-org/gitlab-ce!29512
| * | | | | Allow Developer role to delete tags via container registry apiJason Goodman2019-06-176-10/+12
|/ / / / / | | | | | | | | | | | | | | | This brings the API permissions in line with the UI permissions
* | | | | Merge branch '35428-docker-registry-date-not-accurate' into 'master'Filipa Lacerda2019-06-173-4/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Docker registry date not accurate" Closes #35428 See merge request gitlab-org/gitlab-ce!29464
| * | | | | Resolve "Docker registry date not accurate"Nick Kipling2019-06-173-4/+10
|/ / / / /
* | | | | Merge branch '8429-enforce-template-inclusion-in-pipelines-fe-backport' into ↵Filipa Lacerda2019-06-171-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Backporting required template form on admin CI/CD See merge request gitlab-org/gitlab-ce!29154
| * | | | | Backporting an EE admin form8429-enforce-template-inclusion-in-pipelines-fe-backportScott Hampton2019-06-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE added a required template form on the CI/CD page. This is a backport for that change.
* | | | | | Merge branch 'boolean-values-from-matches-operator' into 'master'Kamil Trzciński2019-06-173-59/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | return boolean from Pipeline::Expression::Lexeme::Matches#evaluate See merge request gitlab-org/gitlab-ce!29717
| * | | | | | Return boolean from Lexeme::Matches#evaluateboolean-values-from-matches-operatordrew cimino2019-06-143-59/+28
| | | | | | |
* | | | | | | Merge branch 'sh-fix-issue-63158' into 'master'Rémy Coutable2019-06-175-1/+79
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inability to set visibility_level on project via API Closes #63158 See merge request gitlab-org/gitlab-ce!29578
| * | | | | | | Fix inability to set visibility_level on project via APIsh-fix-issue-63158Stan Hu2019-06-145-1/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the scenario: 1. The default visibility level is set to internal 2. A user attempts to create a private project within a private group Previously this would always fail because default_value_for would overwrite the private visibility setting, no matter what visibility_level were specified. This was happening because default_value_for was confused by the default value of 0 specified by the database schema. default_value_for attempts to assign the default value in the block by checking whether the attribute has changed. The problem is that since the default value by the database was 0, and the user requested 0, this appeared as though no changes were made. As a result, default_value_for would always overwrite the user's preference. To fix this, we remove the use of default_value_for and only set the visibility level to the default application setting when no preference has been given at creation time. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63158
* | | | | | | | Merge branch 'revert-3a50fc5d' into 'master'Filipa Lacerda2019-06-1725-150/+54
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'" See merge request gitlab-org/gitlab-ce!29684
| * | | | | | | | Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'"revert-3a50fc5dKamil Trzciński2019-06-1425-150/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !26853
* | | | | | | | | Merge branch '62910-task-completion-status-gql-pderichs' into 'master'Sean McGivern2019-06-176-1/+81
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make task completion status available via GraphQL Closes #62910 See merge request gitlab-org/gitlab-ce!29573
| * | | | | | | | Add task count and completed count to graphql types62910-task-completion-status-gql-pderichsPatrick Derichs2019-06-156-1/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs for task completion status (graphql) Fix style issues Changed format of constants in spec Refactor specs to reduce creation of records Reduce parameters to merge request creation Use set's for project and user Move let's out of it_behaves_like block Fix description parameter Fix format of lets Use dig to get task completion status out of graphql response Modified rspec output Add changelog entry
* | | | | | | | | Merge branch 'sh-clean-query-recorder-backtrace' into 'master'Sean McGivern2019-06-171-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean QueryRecorder backtrace See merge request gitlab-org/gitlab-ce!29724
| * | | | | | | | | Clean QueryRecorder backtracesh-clean-query-recorder-backtraceStan Hu2019-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it much easier to debug N+1 queries via QueryRecorder by eliminating unnecessary lines.
* | | | | | | | | | Merge branch 'gitlab-ui-259-style-checkboxes' into 'master'Kushal Pandya2019-06-171-3/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make changes suggested by Pedro for UX See merge request gitlab-org/gitlab-ce!29324
| * | | | | | | | | | Apply improved styling based on UX feedbackgitlab-ui-259-style-checkboxesSam Bigelow2019-06-121-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only apply extra margins and borders between checkbox components - Change cursor to `not-allowed` when checkbox is disabled - Adjust handling of inline checkbox styling vs block
* | | | | | | | | | | Merge branch 'docs-existing-knative' into 'master'Evan Read2019-06-171-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation on using serverless with existing Knative instance See merge request gitlab-org/gitlab-ce!29699
| * | | | | | | | | | | Add documentation on using serverless with existing Knative instanceDaniel Gruesso2019-06-171-0/+9
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'sh-bump-ruby-labkit' into 'master'Ash McKenzie2019-06-172-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gitlab-labkit to 0.3.0 See merge request gitlab-org/gitlab-ce!29728
| * | | | | | | | | | | Upgrade gitlab-labkit to 0.3.0Stan Hu2019-06-172-4/+4
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches the version used in Gitaly, bumps the gRPC version to be aligned with GitLab CE/EE, and adds gRPC interceptor support: https://gitlab.com/gitlab-org/labkit-ruby/compare/v0.2.0...v0.3.0
* | | | | | | | | | | Merge branch 'docs-university-link' into 'master'Evan Read2019-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix link in university support doc See merge request gitlab-org/gitlab-ce!29582