diff options
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | PHILOSOPHY.md | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js | 2 | ||||
| -rw-r--r-- | app/views/abuse_reports/new.html.haml | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/kcj-add-philosophy.yml | 5 | ||||
| -rw-r--r-- | doc/api/README.md | 2 | ||||
| -rw-r--r-- | doc/user/project/labels.md | 2 | ||||
| -rw-r--r-- | doc/user/project/pages/getting_started_part_three.md | 4 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 |
10 files changed, 25 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c662f42111..bb37b60b8f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -620,7 +620,8 @@ gitlab:assets:compile: - webpack-report/ - public/assets/ tags: - - docker + - gitlab-org-delivery + - high-cpu karma: <<: *dedicated-no-docs-pull-cache-job diff --git a/CHANGELOG.md b/CHANGELOG.md index 54ea014a679..62faaf86f42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 11.4.7 (2018-11-20) + +- No changes. + ## 11.4.6 (2018-11-18) ### Security (1 change) diff --git a/PHILOSOPHY.md b/PHILOSOPHY.md new file mode 100644 index 00000000000..e966d88ef78 --- /dev/null +++ b/PHILOSOPHY.md @@ -0,0 +1 @@ +This document is intended to communicate the product philosophy GitLab uses in creating GitLab Community Edition. The principles can be found in the [Product Section of the GitLab Handbook](https://about.gitlab.com/handbook/product/#product-at-gitlab).
\ No newline at end of file diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js index 5f86fc9e63d..2918e1486a7 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js @@ -30,7 +30,7 @@ export default class ShortcutsIssuable extends Shortcuts { return false; } - const documentFragment = getSelectedFragment(document.querySelector('.issuable-details')); + const documentFragment = getSelectedFragment(document.querySelector('#content-body')); if (!documentFragment) { $replyField.focus(); diff --git a/app/views/abuse_reports/new.html.haml b/app/views/abuse_reports/new.html.haml index 84c3dfd8b91..92ae40512c5 100644 --- a/app/views/abuse_reports/new.html.haml +++ b/app/views/abuse_reports/new.html.haml @@ -1,8 +1,8 @@ - page_title _("Report abuse to GitLab") %h3.page-title - = _('Report abuse to GitLab') + = _("Report abuse to GitLab") %p - = _('Please use this form to report users to GitLab who create spam issues, comments or behave inappropriately.') + = _("Please use this form to report users to GitLab who create spam issues, comments or behave inappropriately.") %p = _("A member of GitLab's abuse team will review your report as soon as possible.") %hr @@ -20,7 +20,7 @@ .col-sm-10 = f.text_area :message, class: "form-control", rows: 2, required: true, value: sanitize(@ref_url) .form-text.text-muted - = _('Explain the problem. If appropriate, provide a link to the relevant issue or comment.') + = _("Explain the problem. If appropriate, provide a link to the relevant issue or comment.") .form-actions - = f.submit "Send report", class: "btn btn-success" + = f.submit _("Send report"), class: "btn btn-success" diff --git a/changelogs/unreleased/kcj-add-philosophy.yml b/changelogs/unreleased/kcj-add-philosophy.yml new file mode 100644 index 00000000000..d164ce165ea --- /dev/null +++ b/changelogs/unreleased/kcj-add-philosophy.yml @@ -0,0 +1,5 @@ +--- +title: Adds a PHILOSOPHY.md which references GitLab Product Handbook +merge_request: 23200 +author: +type: other diff --git a/doc/api/README.md b/doc/api/README.md index 19abbdc7a1e..0e8d1aaf86e 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -105,7 +105,7 @@ not explicit. This allows for a stable API endpoint, but also means new features can be added to the API in the same version number. New features and bug fixes are released in tandem with a new GitLab, and apart -from incidental patch and security releases, are released on the 22nd each +from incidental patch and security releases, are released on the 22nd of each month. Backward incompatible changes (e.g. endpoints removal, parameters removal etc.), as well as removal of entire API versions are done in tandem with a major point release of GitLab itself. All deprecations and changes diff --git a/doc/user/project/labels.md b/doc/user/project/labels.md index 3ae6dbe585e..f7119f3bf3c 100644 --- a/doc/user/project/labels.md +++ b/doc/user/project/labels.md @@ -19,6 +19,7 @@ A permission level of `Developer` or higher is required to create labels. ### New project label To create a **project label**, navigate to **Issues > Labels** in the project. +This page only shows project labels in this project and group labels of this project's parent group. Click the **New label** button. Enter the title, an optional description, and the background color. Click **Create label** to create the label. @@ -33,6 +34,7 @@ GitLab will add the following default labels to the project: ### New group label To create a **group label**, follow similar steps from above to project labels. Navigate to **Issues > Labels** in the group and create it from there. +This page only shows group labels in this group. Group labels appear in every label list page of the group's child projects. diff --git a/doc/user/project/pages/getting_started_part_three.md b/doc/user/project/pages/getting_started_part_three.md index 89b9621b8b9..26891348b0c 100644 --- a/doc/user/project/pages/getting_started_part_three.md +++ b/doc/user/project/pages/getting_started_part_three.md @@ -1,5 +1,5 @@ --- -last_updated: 2018-08-16 +last_updated: 2018-11-19 author: Marcia Ramos author_gitlab: marcia level: beginner @@ -183,7 +183,7 @@ you can use the following setup: - In Cloudflare, create a DNS `A` record pointing `domain.com` to `35.185.44.232` - In GitLab, add the domain to GitLab Pages - In Cloudflare, create a DNS `TXT` record to verify your domain -- In Cloudflare, create a DNS `CNAME` record poiting `www` to `domain.com` +- In Cloudflare, create a DNS `CNAME` record pointing `www` to `domain.com` ## SSL/TLS Certificates diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 3d9a9bf48e6..b65b0a0a920 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5662,6 +5662,9 @@ msgstr "" msgid "Send email" msgstr "" +msgid "Send report" +msgstr "" + msgid "Send usage data" msgstr "" |