diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-30 11:19:07 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-30 11:19:07 +0000 |
commit | 46d8209e8c525ec619693c4e09ace3ef59c64d5f (patch) | |
tree | 94d1afe86054f7d52cb743abb52db3532a835681 /CONTRIBUTING.md | |
parent | 94743e0e8fa80f9dc2f2200f33c7047e859ee12d (diff) | |
parent | 6919f6361c3cfa87a38cd7eb391ade70823c9106 (diff) | |
download | gitlab-ce-46d8209e8c525ec619693c4e09ace3ef59c64d5f.tar.gz |
Merge branch 'master' into 38869-importer_status
* master: (51 commits)
Move locked check to a guard-clause
Ci::Build tag is a trait instead of an own factory
[CE backport] Saved configuration for issue board
Use the correct project visibility in system hooks
Add changelog
more readable changelog
Make merge_jid handling less stateful in MergeService
Fetch the merged branches at once
remove extra whitespace
use a delegate for `username` to be more future friendly
Merging EE doc into CE
add changelog entry
Avoid using Rugged in Gitlab::Git::Wiki#preview_slug
Cache commits on the repository model
Remove groups_select from global namespace & simplifies the code
Change default disabled merge request widget message to "Merge is not allowed yet"
Semi-linear history merge is now available in CE.
Remove repetitive karma spec
Improve spec to check hidden component
Rename to shouldShowUsername
...
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r-- | CONTRIBUTING.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 83e41a11e52..9b2ee157193 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,10 +21,10 @@ _This notice should stay as the first item in the CONTRIBUTING.md file._ - [Workflow labels](#workflow-labels) - [Type labels (~"feature proposal", ~bug, ~customer, etc.)](#type-labels-feature-proposal-bug-customer-etc) - [Subject labels (~wiki, ~"container registry", ~ldap, ~api, etc.)](#subject-labels-wiki-container-registry-ldap-api-etc) - - [Team labels (~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.)](#team-labels-ci-discussion-edge-platform-etc) + - [Team labels (~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.)](#team-labels-cicd-discussion-edge-platform-etc) - [Priority labels (~Deliverable and ~Stretch)](#priority-labels-deliverable-and-stretch) - [Label for community contributors (~"Accepting Merge Requests")](#label-for-community-contributors-accepting-merge-requests) -- [Implement design & UI elements](#implement-design--ui-elements) +- [Implement design & UI elements](#implement-design-ui-elements) - [Issue tracker](#issue-tracker) - [Issue triaging](#issue-triaging) - [Feature proposals](#feature-proposals) |