summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '62124-new-threaded-discussion-design' into 'master'Fatih Acet2019-06-0623-51/+208
|\ | | | | | | | | | | | | Resolve "New threaded discussion design" Closes #62124 See merge request gitlab-org/gitlab-ce!28580
| * Format vue files with prettierMarcel van Remmerden2019-06-0623-51/+208
|/ | | | Add changelog file
* Merge branch ↵Dmitriy Zaporozhets2019-06-063-16/+25
|\ | | | | | | | | | | | | | | | | '62847-url-for-the-next-request-with-pagination-is-missing-port' into 'master' Resolve "Url for the next request with pagination is missing port" Closes #62847 See merge request gitlab-org/gitlab-ce!29267
| * Include the port in the URLs of the API Link headersRémy Coutable2019-06-063-16/+25
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'js-i18n-datetime' into 'master'Filipa Lacerda2019-06-062-1/+4
|\ \ | | | | | | | | | | | | i18n datetime_utility file See merge request gitlab-org/gitlab-ce!29193
| * | I18N datetime utility filejs-i18n-datetimeBrandon Labuschagne2019-06-052-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | Merge branch '62015-add-counterpart-tae-to-the-reviewer-roulette' into 'master'Sean McGivern2019-06-0615-21/+89
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add counterpart TAE to the reviewer roulette" Closes #62015 See merge request gitlab-org/gitlab-ce!28678
| * | | Show Test Automation Engineer for spec/feature asLin Jen-Shin2019-06-0615-21/+89
| | | | | | | | | | | | | | | | reviewers.
* | | | Merge branch '55125-mr-tab-scrolling' into 'master'Phil Hughes2019-06-0617-85/+131
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of MR tabs and buttons Closes #55125 See merge request gitlab-org/gitlab-ce!29088
| * | | | Merge request tabs fixesAnnabel Dunstone Gray2019-06-0617-85/+131
|/ / / / | | | | | | | | | | | | | | | | | | | | - Makes activity dropdown and resolved counter smaller - Uses grid for spacing - Removes scrolling on MR tabs
* | | | Merge branch 'fix/allow-lower-case-issue-ids' into 'master'Sean McGivern2019-06-064-5/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow lowercase prefix for Youtrack issue ids Closes #62661 See merge request gitlab-org/gitlab-ce!29057
| * | | | Add changelogMatthias Baur2019-06-051-0/+5
| | | | |
| * | | | Apply suggestion to doc/user/project/integrations/youtrack.mdMatthias Baur2019-06-051-2/+2
| | | | |
| * | | | Allow lowercase prefix for Youtrack issue idsMatthias Baur2019-06-033-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Relates to #42595. Fixes #62661.
* | | | | Merge branch 'docs/ssot_group_clusters2' into 'master'Marcia Ramos2019-06-061-1/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added troubleshooting section to "Group-level Kubernetes clusters" See merge request gitlab-org/gitlab-ce!29228
| * | | | | Added troubleshooting section to "Group-level Kubernetes clusters"Russell Dickenson2019-06-061-1/+13
|/ / / / /
* | | | | Merge branch 'dismissal-reason-docs-update' into 'master'Achilleas Pipinellis2019-06-063-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds documentation for vulnerability dismissal reasons See merge request gitlab-org/gitlab-ce!29213
| * | | | | Adds documentation for vulnerability dismissal reasonsSam Beckham2019-06-063-0/+10
|/ / / / /
* | | | | Merge branch '60852-update-or-upgrade' into 'master'Phil Hughes2019-06-0611-142/+139
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "update" instead of "upgrade" in Clusters -> Managed Apps Closes #60852 See merge request gitlab-org/gitlab-ce!29207
| * | | | | Replace upgrade with updateEnrique Alcántara2019-06-0611-142/+139
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Use update term instead of update in the clusters managed app implementation in order to make the implementation and UI language more consistent.
* | | | | Merge branch 'jv-catfile-limit-test-only' into 'master'Stan Hu2019-06-061-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Only use Gitaly catfile_cache_size=5 in test See merge request gitlab-org/gitlab-ce!29264
| * | | | | Only use Gitaly catfile_cache_size=5 in testJacob Vosmaer2019-06-061-1/+7
|/ / / / /
* | | | | Merge branch 'revert-a05f86ce' into 'master'Nick Thomas2019-06-068-155/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'pages-domain_ssl-valid-period' into 'master'" Closes #62861 See merge request gitlab-org/gitlab-ce!29273
| * | | | | Revert "Merge branch 'pages-domain_ssl-valid-period' into 'master'"revert-a05f86ceNick Thomas2019-06-068-155/+2
|/ / / / / | | | | | | | | | | This reverts merge request !28743
* | | | | Merge branch 'sh-fix-issue-55869' into 'master'Stan Hu2019-06-065-76/+45
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of resend button in members page Closes #55869 See merge request gitlab-org/gitlab-ce!28202
| * | | | | Fix alignment of resend button in members pageStan Hu2019-06-065-76/+45
|/ / / / / | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55869
* | | | | Merge branch 'pages-domain_ssl-valid-period' into 'master'Nick Thomas2019-06-068-2/+155
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add certificate valid time to pages domain table See merge request gitlab-org/gitlab-ce!28743
| * | | | | Add certificate valid time to pages domain tableVladimir Shushlin2019-06-068-2/+155
|/ / / / / | | | | | | | | | | | | | | | | | | | | Save certificate validity time for pages domains on save Fill validity time for existing pages domains in background migration
* | | | | Merge branch ↵Nick Thomas2019-06-061-112/+26
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 'ce-11314-elasticsearch-rake-tasks-should-respect-new-elasticsearch-limited-namespaces-projects-functionality' into 'master' Update docs for Elasticsearch indexing tasks See merge request gitlab-org/gitlab-ce!29132
| * | | | Update docs for Elasticsearch indexing tasksce-11314-elasticsearch-rake-tasks-should-respect-new-elasticsearch-limited-namespaces-projects-functionalityMarkus Koller2019-06-061-112/+26
| | | | |
* | | | | Merge branch 'ce-update-es-indexer' into 'master'Rémy Coutable2019-06-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE port of "Update the elasticsearch indexer" See merge request gitlab-org/gitlab-ce!29237
| * | | | | Update the elasticsearch indexerNick Thomas2019-06-061-1/+1
| | | | | |
* | | | | | Merge branch 'feature/gb/use-gitlabktl-to-build-serverless-applications' ↵Kamil Trzciński2019-06-062-8/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Use `gitlabktl` to build serverless applications Closes #61184 See merge request gitlab-org/gitlab-ce!29258
| * | | | | | Fix typo in a changelog descriptionGrzegorz Bizon2019-06-062-8/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'fix/gb/fix-serverless-apps-deployment-template' into 'master'Kamil Trzciński2019-06-062-1/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix serverless apps deployments by bumping `tm` version Closes #62543 See merge request gitlab-org/gitlab-ce!29254
| * | | | | Fix serverless app deployments by bumping `tm` versionGrzegorz Bizon2019-06-062-1/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | Previous version of the `tm` tool had a bug that resulted in not being able to deploy serverless applications using this version.
* | | | | Merge branch '62706-graphql-complexity-values-are-incorrectly-doubled' into ↵Jan Provaznik2019-06-065-27/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Reduce GraphQL complexity for non-connection fields Closes #62706 See merge request gitlab-org/gitlab-ce!29165
| * | | | | Grab field_defn to access certain values62706-graphql-complexity-values-are-incorrectly-doubledBrett Walker2019-06-051-2/+4
| | | | | |
| * | | | | Use :complexity_multiplier only with connectionsBrett Walker2019-06-055-27/+41
| | | | | | | | | | | | | | | | | | | | | | | | This helps reduce complexity for non-connections
* | | | | | Merge branch 'enforce-template-uniqueness' into 'master'Grzegorz Bizon2019-06-061-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that template is used once See merge request gitlab-org/gitlab-ce!27511
| * | | | | | Ensure that template is used onceKamil Trzciński2019-06-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds additional test that make sure that each template name is used exactly once across all folders exposed
* | | | | | | Merge branch 'fix/gb/remove-serverless-app-build-policies-from-template' ↵Kamil Trzciński2019-06-062-6/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove build policies from serverless app template Closes #62792 See merge request gitlab-org/gitlab-ce!29253
| * | | | | | | Remove build policies from serverless app templateGrzegorz Bizon2019-06-062-6/+5
|/ / / / / / /
* | | | | | | Merge branch '37495' into 'master'Kushal Pandya2019-06-0611-20/+110
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs link for confidential and locked issues Closes #37495 See merge request gitlab-org/gitlab-ce!29073
| * | | | | | Add doc links for confidential and locked issuesFatih Acet2019-06-0611-20/+110
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | With this commit, we add docs link for confidential and locked issues to note compose and edit forms
* | | | | | Merge branch ↵Filipa Lacerda2019-06-068-16/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '59376-Report-abuse-to-GitLab-should-be-Report-abuse-in-non-gitlab.com-instances' into 'master' Change "Report abuse to GitLab" to more generic wording. Closes #59376 See merge request gitlab-org/gitlab-ce!28884
| * | | | | | Change "Report abuse to GitLab" to more generic wording.Marc Schwede2019-06-068-16/+21
|/ / / / / /
* | | | | | Merge branch 'copy-button-in-modals' into 'master'Filipa Lacerda2019-06-064-0/+180
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a New Copy Button That Works in Modals Closes #60988 See merge request gitlab-org/gitlab-ce!28676
| * | | | | | Add a New Copy Button That Works in ModalsAndrew Fontaine2019-06-064-0/+180
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This copy button manages a local instance of the Clipboard plugin specific to it, which means it is created/destroyed on the creation/destruction of the component. This allows it to work well in gitlab-ui modals, as the event listeners are bound on creation of the button. It also allows for bindings to the `container` option of the Clipboard plugin, which allows it to work within the focus trap set by bootstrap's modals.
* | | | | | Merge branch 'always-show-pipelines-must-succeed-checkbox' into 'master'Filipa Lacerda2019-06-064-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always show "Pipelines must succeed" checkbox Closes #57291 See merge request gitlab-org/gitlab-ce!28651