CONTRIBUTING.md in gitlab-markup-1.6.0 vs CONTRIBUTING.md in gitlab-markup-1.6.1

@@ -1,20 +1,55 @@
 # Contributing
 
-This project adheres to the [Open Code of Conduct][code-of-conduct]. By participating, you are expected to honor this code.
-[code-of-conduct]: http://todogroup.org/opencodeofconduct/#GitHub%20Markup/[e-mail]
+Thank you for your interest in contributing to this GitLab project! We welcome
+all contributions. By participating in this project, you agree to abide by the
+[code of conduct](#code-of-conduct).
 
-This library's only job is to decide which markup format to use and call out to an external library to convert the markup to HTML (see the [README](README.md) for more information on how markup is rendered on GitHub.com).
+This library's only job is to decide which markup format to use and call out to an external library to convert the markup to HTML (see the [README](README.md) for more information on how markup is rendered)
 
-If you are having an issue with:
+## Contributor license agreement
 
-* **Syntax highlighting** - see [github/linguist](https://github.com/github/linguist/blob/master/CONTRIBUTING.md#fixing-syntax-highlighting)
-* **Markdown on GitHub** - contact [e-mail]
-* **Styling issues on GitHub** - see [primer/markdown](https://github.com/primer/markdown)
+By submitting code as an individual you agree to the [individual contributor
+license agreement][individual-agreement].
 
-Anything else - [search open issues](https://github.com/github/markup/issues) or create an issue and and we'll help point you in the right direction.
+By submitting code as an entity you agree to the [corporate contributor license
+agreement][corporate-agreement].
 
+## Code of conduct
+
+As contributors and maintainers of this project, we pledge to respect all people
+who contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual
+language or imagery, derogatory comments or personal attacks, trolling, public
+or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct. Project maintainers who do not follow the
+Code of Conduct may be removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior can be
+reported by emailing [e-mail].
+
+This Code of Conduct is adapted from the [Contributor Covenant][contributor-covenant], version 1.1.0,
+available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/).
+
+[contributor-covenant]: http://contributor-covenant.org
+[individual-agreement]: https://docs.gitlab.com/ee/legal/individual_contributor_license_agreement.html
+[corporate-agreement]: https://docs.gitlab.com/ee/legal/corporate_contributor_license_agreement.html
+
+
 ## Submitting a Merge Request
 
 1. Fork it.
 2. Create a branch (`git checkout -b my_markup`)
 3. Commit your changes (`git commit -am "Added Snarkdown"`)
@@ -40,10 +75,8 @@
   0. Build the new version with `rake build`
   0. Copy `pkg/gitlab-markup*.gem` to `vendor/cache` in your local checkout of GitHub
   0. Update the version for `gitlab-markup` in the `Gemfile`
   0. Run `bundle update --local gitlab-markup`
   0. Run any relevant tests and test it manually from the browser.
-0. Push the new gem release with `rake release`. If you don't have permission to release to rubygems.org, contact one of the existing owners (`gem owners github-markup`) and ask them to add you.
+0. Push the new gem release with `rake release`. If you don't have permission to release to rubygems.org, contact one of the existing owners (`gem owners gitlab-markup`) and ask them to add you.
 
 [1]: https://gitlab.com/gitlab-org/gitlab-markup/merge_requests
-[r2h]: lib/github/commands/rest2html
-[r2hc]: lib/github/markups.rb#L51