summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update error message54506-show-error-when-namespace-svc-missingjerasmus2019-04-031-1/+1
| | | | Updated the error message in the docs
* Format changed frontend filesjerasmus2019-04-021-1/+4
| | | | Ran yarn prettier changed frontend files
* Fix frontend unit testsjerasmus2019-04-023-5/+3
| | | | Fixed the broken frontend unit tests
* Display error for unmet prerequisitesjerasmus2019-04-0212-4/+146
| | | | Added the ability to display an error for unmet prerequisites
* Expose build failure reasonTiger2019-04-022-0/+12
| | | | | We can use this to show more informative error messages with links to documentation etc.
* Detailed status for builds that fail prerequisitesTiger2019-04-025-1/+97
| | | | | | | Create FailedUnmetPrerequisites status to allow custom messaging for builds that were unable to be queued due to failing to meet prerequisites (eg. failing to create Kubernetes namespace for deployment).
* Merge branch 'patch-31' into 'master'Evan Read2019-04-011-5/+2
|\ | | | | | | | | Clarify that personal access token should be sent as password for authentication. See merge request gitlab-org/gitlab-ce!22603
| * Clarify that personal access token should be sent as password for ↵Tim Hobbs2019-04-011-5/+2
|/ | | | authentication.
* Merge branch 'patch-48' into 'master'Evan Read2019-04-011-0/+26
|\ | | | | | | | | Update to the commits.md, more details about how to use the --form method for creating a commit See merge request gitlab-org/gitlab-ce!26329
| * Update to the commits.md, more details about how to use the --form method ↵Jochum van der Ploeg2019-04-011-0/+26
|/ | | | for creating a commit
* Merge branch 'docs-fix-import-mixin-from-ee-else-ce-path-example' into 'master'Evan Read2019-04-011-6/+7
|\ | | | | | | | | Fix example block for mixin from ee-else-ce path See merge request gitlab-org/gitlab-ce!26808
| * Fix example block for mixin from ee-else-ce pathdocs-fix-import-mixin-from-ee-else-ce-path-exampleEzekiel Kigbo2019-03-311-6/+7
| |
* | Merge branch 'sh-fix-image-permissions' into 'master'Evan Read2019-04-013-0/+0
|\ \ | | | | | | | | | | | | Remove executable permission on images See merge request gitlab-org/gitlab-ce!26800
| * | Remove executable permission on imagessh-fix-image-permissionsStan Hu2019-03-303-0/+0
| |/ | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/187433314
* | Merge branch 'patch-49' into 'master'Evan Read2019-04-011-0/+11
|\ \ | | | | | | | | | | | | Update lfs_administration.md to add documentation on Rackspace Cloud Files for... See merge request gitlab-org/gitlab-ce!26720
| * | Update lfs_administration.md to add documentation on Rackspace Cloud Files ↵Rick Heil2019-03-281-0/+11
| | | | | | | | | | | | for LFS object storage, including a note on Fog requiring the temp-url key even when the object container is public ("CDN enabled" in Rackspace terms)
* | | Merge branch 'jira-transition-id-field' into 'master'Evan Read2019-04-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Jira Services Doc update to String See merge request gitlab-org/gitlab-ce!26683
| * | | Jira Services Doc update to Stringjira-transition-id-fieldDavin Walker2019-03-271-1/+1
| | | |
* | | | Merge branch 'nowtryz/docker-pages-docs' into 'master'Evan Read2019-04-011-7/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add troubleshooting info for Docker and GitLab Pages See merge request gitlab-org/gitlab-ce!26662
| * | | | Add troubleshooting info for Docker and GitLab Pagesnowtryz/docker-pages-docsDamien2019-03-271-7/+22
| | | | |
* | | | | Merge branch 'clarify_onlychanges' into 'master'Evan Read2019-04-011-13/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Clarify onlychanges See merge request gitlab-org/gitlab-ce!22790
| * | | | doc: Professionalize only:changes sectionOlliver Schinagl2019-03-251-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using we and you isn't very pleasant to read nor is it professional. So lets remove these invocations to have a more pleasant read. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
* | | | | Merge branch '59309-objectstorage-set-no-acl' into 'master'Stan Hu2019-03-302-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to set any ACL on uploaded objects Closes #59309 See merge request gitlab-org/gitlab-ce!26781
| * | | | | Don't try to set any ACL on uploaded objectsBastian Blank2019-03-302-2/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set ACL of uploaded objects to not-public (fog-aws) or no ACL at all (fog-google). Value is ignored by other supported backends (fog-aliyun, fog-openstack, fog-rackspace) This allows uploads to GCS with ACL support disabled.
* | | | | Merge branch 'sh-fix-failing-spec-on-first-da' into 'master'James Lopez2019-03-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing spec in spec/features/users/login_spec.rb Closes #59731 See merge request gitlab-org/gitlab-ce!26787
| * | | | | Fix failing spec in spec/features/users/login_spec.rbStan Hu2019-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This spec would start to fail on the first of the month because the generated text would have a zero-padded day (e.g. 01 vs 1), whereas the expected text check used an unpadded day via the `-d` parameter in strftime (https://apidock.com/ruby/Date/strftime). To fix this, we use use the `d` parameter to pad zeros. This spec was introduced recently in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25731. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59731
* | | | | | Merge branch 'qa-ml-fix-push-file-size-test' into 'master'button-arrangementDan Davison2019-03-291-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Fix 2 of 3 problems with the push file size tests See merge request gitlab-org/gitlab-ce!26741
| * | | | | | Fix push file size testqa-ml-fix-push-file-size-testMark Lapierre2019-03-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to re-create master as a new branch. Expect a Git error raised when the file it too large.
* | | | | | | Merge branch 'leipert-hotfix-ci-yml' into 'master'Stan Hu2019-03-291-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitLab CI branch matching pattern See merge request gitlab-org/gitlab-ce!26777
| * | | | | | | Fix GitLab CI branch matching patternLukas Eipert2019-03-291-7/+7
| | | | | | | |
* | | | | | | | Merge branch 'dennis-positioning-important' into 'master'Clement Ho2019-03-291-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Designate common positioning classes as `!important` a la Bootstrap See merge request gitlab-org/gitlab-ce!26621
| * | | | | | | | Designate common positioning classes as important a la Bootstrapdennis-positioning-importantDennis Tang2019-03-261-4/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/zj-patch-json' into 'master'Nick Thomas2019-03-291-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use valid data in our GetCommit example response See merge request gitlab-org/gitlab-ce!26770
| * | | | | | | | | Use valid data in our GetCommit example responsedocs/zj-patch-jsonZeger-Jan van de Weg2019-03-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When validating parsing, copy pasting should just work, but instead we created
* | | | | | | | | | Merge branch 'rename-cluster-managed-method' into 'master'Douglas Barbosa Alexandre2019-03-2912-26/+137
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renames Cluster#managed? to provided_by_user? See merge request gitlab-org/gitlab-ce!26567
| * | | | | | | | | | Renames Cluster#managed? to provided_by_user?Mayra Cabrera2019-03-2912-26/+137
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow to user the term managed? on https://gitlab.com/gitlab-org/gitlab-ce/issues/56557. Managed? will be used to distinct clusters that are automatically managed by GitLab
* | | | | | | | | | Merge branch 'update-contribution-closing-policy' into 'master'Marcia Ramos2019-03-291-2/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update contribution closing policy See merge request gitlab-org/gitlab-ce!26728
| * | | | | | | | | Docs: Update contribution closing policy to include community attributionLucas Charles2019-03-291-2/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch 'winh-jest-html-fixtures' into 'master'Clement Ho2019-03-294-10/+47
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add helpers for HTML fixtures to Jest Closes #57998 See merge request gitlab-org/gitlab-ce!26739
| * | | | | | | | | | Add Karma-style fixture helpers to Jestwinh-jest-html-fixturesWinnie Hellmann2019-03-293-2/+17
| | | | | | | | | | |
| * | | | | | | | | | Add helpers for HTML fixtures to JestWinnie Hellmann2019-03-291-6/+20
| | | | | | | | | | |
| * | | | | | | | | | Add workaround for innerText in JestWinnie Hellmann2019-03-291-0/+9
| | | | | | | | | | |
| * | | | | | | | | | Move abuse_reports_spec.js to JestWinnie Hellmann2019-03-291-2/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'docs-ci-deprecated-variables' into 'master'Mike Lewis2019-03-292-30/+32
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: new doc for deprecated variables See merge request gitlab-org/gitlab-ce!26737
| * | | | | | | | | | New doc - deprecated variablesdocs-ci-deprecated-variablesMarcia Ramos2019-03-282-30/+32
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Clement Ho2019-03-292-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.57.0 See merge request gitlab-org/gitlab-ce!26758
| * | | | | | | | | | Update dependency @gitlab/svgs to ^1.57.0Lukas 'Eipi' Eipert2019-03-292-5/+5
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '58971-sentry-api-keyerror' into 'master'57970-i18n-linters-eslint-jsSean McGivern2019-03-298-31/+163
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle missing keys in sentry api response Closes #58971 See merge request gitlab-org/gitlab-ce!26264
| * | | | | | | | | | Handle missing keys in sentry api responseReuben Pereira2019-03-298-31/+163
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not raise error when there are missing non-essential keys in sentry api response. - Add specs for to check for missing keys behavior.
* | | | | | | | | | Merge branch '50199-quick-actions-refactor' into 'master'Sean McGivern2019-03-2950-1069/+3128
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend quick actions dsl Closes #50199 See merge request gitlab-org/gitlab-ce!26095