Commit 3c7a80646198c546a2cfd4aa05b7724f51a6eb7f
Exists in
spb-stable
and in
3 other branches
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Showing
2 changed files
with
12 additions
and
12 deletions
Show diff stats
PROCESS.md
| ... | ... | @@ -69,19 +69,19 @@ If an issue is complex and needs the attention of a specific person, assignment |
| 69 | 69 | |
| 70 | 70 | ### Improperly formatted issue |
| 71 | 71 | |
| 72 | -Thanks for the issue report. Please reformat your issue to conform to the issue tracker guidelines found in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/masterCONTRIBUTING.md#issue-tracker-guidelines). | |
| 72 | +Thanks for the issue report. Please reformat your issue to conform to the issue tracker guidelines found in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines). | |
| 73 | 73 | |
| 74 | 74 | ### Feature requests |
| 75 | 75 | |
| 76 | -Thanks for your interest in GitLab. We don't use the GitHub issue tracker for feature requests. Please use http://feedback.gitlab.com/ for this purpose or create a merge request implementing this feature. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/masterCONTRIBUTING.md) for more information. | |
| 76 | +Thanks for your interest in GitLab. We don't use the GitHub issue tracker for feature requests. Please use http://feedback.gitlab.com/ for this purpose or create a merge request implementing this feature. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) for more information. | |
| 77 | 77 | |
| 78 | 78 | ### Issue report for old version |
| 79 | 79 | |
| 80 | -Thanks for the issue report but we only support issues for the latest stable version of GitLab. I'm closing this issue but if you still experience this problem in the latest stable version, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/masterCONTRIBUTING.md#issue-tracker-guidelines). | |
| 80 | +Thanks for the issue report but we only support issues for the latest stable version of GitLab. I'm closing this issue but if you still experience this problem in the latest stable version, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines). | |
| 81 | 81 | |
| 82 | 82 | ### Support requests and configuration questions |
| 83 | 83 | |
| 84 | -Thanks for your interest in GitLab. We don't use the GitHub issue tracker for support requests and configuration questions. Please use the \[support forum\]\(https://groups.google.com/forum/#!forum/gitlabhq), \[Stack Overflow\]\(http://stackoverflow.com/questions/tagged/gitlab), the unofficial #gitlab IRC channel on Freenode or the http://www.gitlab.com paid services for this purpose. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/masterCONTRIBUTING.md) for more information. | |
| 84 | +Thanks for your interest in GitLab. We don't use the GitHub issue tracker for support requests and configuration questions. Please use the \[support forum\]\(https://groups.google.com/forum/#!forum/gitlabhq), \[Stack Overflow\]\(http://stackoverflow.com/questions/tagged/gitlab), the unofficial #gitlab IRC channel on Freenode or the http://www.gitlab.com paid services for this purpose. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) for more information. | |
| 85 | 85 | |
| 86 | 86 | ### Code format |
| 87 | 87 | |
| ... | ... | @@ -89,17 +89,17 @@ Please use ``` to format console output, logs, and code as it's very hard to rea |
| 89 | 89 | |
| 90 | 90 | ### Issue fixed in newer version |
| 91 | 91 | |
| 92 | -Thanks for the issue report. This issue has already been fixed in newer versions of GitLab. Due to the size of this project and our limited resources we are only able to support the latest stable release as outlined in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/masterCONTRIBUTING.md#issue-tracker). In order to get this bug fix and enjoy many new features please \[upgrade\]\(http://blog.gitlab.org/). If you still experience issues at that time please open a new issue following our issue tracker guidelines found in the \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/masterCONTRIBUTING.md#issue-tracker-guidelines). | |
| 92 | +Thanks for the issue report. This issue has already been fixed in newer versions of GitLab. Due to the size of this project and our limited resources we are only able to support the latest stable release as outlined in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker). In order to get this bug fix and enjoy many new features please \[upgrade\]\(http://blog.gitlab.org/). If you still experience issues at that time please open a new issue following our issue tracker guidelines found in the \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines). | |
| 93 | 93 | |
| 94 | 94 | ### Improperly formatted merge request |
| 95 | 95 | |
| 96 | -Thanks for your interest in improving the GitLab codebase! Please update your merge request according to the \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/masterCONTRIBUTING.md#pull-request-guidelines). | |
| 96 | +Thanks for your interest in improving the GitLab codebase! Please update your merge request according to the \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#pull-request-guidelines). | |
| 97 | 97 | |
| 98 | 98 | ### Inactivity close of an issue |
| 99 | 99 | |
| 100 | -It's been at least 2 weeks (and a new release) since we heard from you. I'm closing this issue but if you still experience this problem, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/masterCONTRIBUTING.md#issue-tracker-guidelines). | |
| 100 | +It's been at least 2 weeks (and a new release) since we heard from you. I'm closing this issue but if you still experience this problem, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines). | |
| 101 | 101 | |
| 102 | 102 | ### Inactivity close of a merge request |
| 103 | 103 | |
| 104 | -This merge request has been closed because a request for more information has not been reacted to for more than 2 weeks. If you respond and conform to the merge request guidelines in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/masterCONTRIBUTING.md#pull-requests) we will reopen this merge request. | |
| 104 | +This merge request has been closed because a request for more information has not been reacted to for more than 2 weeks. If you respond and conform to the merge request guidelines in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#pull-requests) we will reopen this merge request. | |
| 105 | 105 | ... | ... |
app/views/projects/hooks/index.html.haml
| ... | ... | @@ -3,7 +3,7 @@ |
| 3 | 3 | |
| 4 | 4 | %p.light |
| 5 | 5 | #{link_to "Web hooks ", help_web_hooks_path, class: "vlink"} can be |
| 6 | - used for binding events when something happends to the the project. | |
| 6 | + used for binding events when something is happening within the project. | |
| 7 | 7 | |
| 8 | 8 | %hr.clearfix |
| 9 | 9 | |
| ... | ... | @@ -25,21 +25,21 @@ |
| 25 | 25 | = f.label :push_events, class: 'list-label' do |
| 26 | 26 | %strong Push events |
| 27 | 27 | %p.light |
| 28 | - This url will be triggered in case of push to repository | |
| 28 | + This url will be triggered by a push to the repository | |
| 29 | 29 | %div |
| 30 | 30 | = f.check_box :issues_events, class: 'pull-left' |
| 31 | 31 | .prepend-left-20 |
| 32 | 32 | = f.label :issues_events, class: 'list-label' do |
| 33 | 33 | %strong Issues events |
| 34 | 34 | %p.light |
| 35 | - This url will be triggered for created issues | |
| 35 | + This url will be triggered when an issue is created | |
| 36 | 36 | %div |
| 37 | 37 | = f.check_box :merge_requests_events, class: 'pull-left' |
| 38 | 38 | .prepend-left-20 |
| 39 | 39 | = f.label :merge_requests_events, class: 'list-label' do |
| 40 | 40 | %strong Merge Request events |
| 41 | 41 | %p.light |
| 42 | - This url will be triggered for created merge requests | |
| 42 | + This url will be triggered when a merge request is created | |
| 43 | 43 | .form-actions |
| 44 | 44 | = f.submit "Add Web Hook", class: "btn btn-create" |
| 45 | 45 | ... | ... |