Commit Graph

187 Commits

Author SHA1 Message Date
Achilleas Pipinellis 6b4d490782 Merge branch 'cla-first' into 'master'
But notice first.

See merge request !9364
2017-03-01 09:28:31 +00:00
Achilleas Pipinellis a36c906c15 Add CLA on top of CONTRIBUTING.md
[ci skip]
2017-03-01 10:27:31 +01:00
James Edwards-Jones 8a619408cf Switched CONTRIBUTING.md style guide recommendation for method chaining 2017-02-23 17:59:38 +00:00
sytses 0b49a2c7e0 But notice first. 2017-02-19 16:21:35 -08:00
Rémy Coutable c6ab1e9d36
Document better the CE -> EE merge
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-02-16 17:57:03 +01:00
Adam Niedzielski 14712aa8ff Fix menu link in CONTRIBUTING 2017-02-09 10:10:36 +00:00
Rémy Coutable ebf168d023 Merge branch 'patch-12' into 'master'
Fix link in CONTRIBUTING.md

See merge request !8859
2017-02-08 16:33:23 +00:00
Job van der Voort 77e7f512c3 add the stewardship label to contributing.md 2017-02-06 13:37:41 +00:00
Rémy Coutable f728589e67
Document that the retro and kickoff notes are public
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-31 14:05:40 +01:00
Carlos Galarza c34e85edc1 Fix link in CONTRIBUTING.md 2017-01-28 16:53:12 +00:00
Adam Niedzielski e9b071e5db Remove "official merge window" from CONTRIBUTING.md [ci skip]
We should not discourage contributors from submitting merge requests
anytime they want. Our process for reviewing community contributions
no longer depends on the release schedule.
2017-01-26 15:58:20 +00:00
Adam Niedzielski 5eaec3c82a Update CONTRIBUTING.md after merging "up-for-grabs" and "Accepting Merge Requests" [ci skip] 2017-01-26 11:21:03 +01:00
Sytse Sijbrandij 7daa541668 Link to k8s contributing doc. 2016-12-27 13:22:02 +01:00
Taurie Davis 604aa680a2 Update CONTRIBUTING.md - Adding info about issues within a milestone 2016-11-16 23:26:01 +00:00
awhildy 4d3ac38570 [ci skip] Fix UX Guide link on Contributing.md 2016-11-15 16:39:14 -08:00
Rémy Coutable daca93c4b1 Merge branch 'rs-bin-changelog' into 'master'
Add a bin/changelog script and changelog documentation

See merge request !7098
2016-11-02 13:25:47 +00:00
Daniel Axelrod 6ed2434afa Replace MR Description Format links
Replace links to the `Merge request description format` section with
up-to-date instructions on using the MR template built into the UI.

The `Merge request description format` section was removed in 2f7e28d1,
but links were left in the table of contents and in the MR description
instructions.
2016-11-02 00:45:15 +00:00
Robert Speicher 23312b484f Add changelog documentation 2016-10-31 14:56:20 +00:00
Robert Speicher 9f7a7115a4 Convert CHANGELOG to Markdown
All this does is convert the version sections into headers. The list
items shouldn't really be indented by two spaces, but it makes no
difference to the rendering and this way we retain authorship history
for the actual changes.

Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29
2016-10-16 21:05:24 +02:00
Rémy Coutable 2f7e28d1f7
Improve the contribution and MR review guide
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-07 15:28:15 +02:00
Achilleas Pipinellis 7ac475164f Merge branch 'sh-add-link-to-reliable-capybara-specs' into 'master'
Add link to article on how to write reliable, asynchronous tests with Capybara

This article has been incredibly useful for all developers. Adding a link to it so more people can refer to it.

See merge request !6312
2016-09-16 09:46:07 +00:00
Stan Hu dbe37d2f6b Add link to article on how to write reliable, asynchronous tests with Capybara
[ci skip]
2016-09-12 12:37:29 -07:00
Rémy Coutable 4ed7ffd385
Simplify the 'Implement design & UI elements' section in CONTRIBUTING
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-07 17:18:39 +02:00
Achilleas Pipinellis ee61c4037e Merge branch 'mr-performance-guides' into 'master'
Added performance guidelines for new MRs

## What does this MR do?

This MR adds a set of guides that should be followed by merge request authors.

## Are there points in the code the reviewer needs to double check?

Spelling, grammar, etc

## Why was this MR needed?

There is no set of guidelines one should follow when submitting merge requests. This leads to developers at times disregarding performance. This in turn results in performance specialists having to clean up the mess, or production engineers being woken up in the middle of the night because the database is on fire.

## Does this MR meet the acceptance criteria?

- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

cc @DouweM @rspeicher @pcarranza @dzaporozhets 

See merge request !5905
2016-08-31 12:51:36 +00:00
Mark Fletcher 7a83df749e Link to the issue templates in Contributing guide
Change to use a better title style

Add backticks to code segments

Spelling and Grammar
2016-08-25 15:48:08 +01:00
Mark Fletcher b1add60648 Reflect template addition in the contributing guide
Adjust bug template to adhere to standard bug report format

* https://developer.mozilla.org/en-US/docs/Mozilla/QA/Bug_writing_guidelines
* Guidelines use the following format

- Summary
- Steps to Reproduce
- Expected Behaviour
- Actual Behaviour
2016-08-24 15:00:33 +01:00
Yorick Peterse e4e03d946e
Added performance guidelines for new MRs
These guidelines cover the performance requirement for newly submitted
merge requests. These guidelines are put in to place to prevent merge
requests from negatively impacting GitLab performance as much as
possible.
2016-08-22 14:32:25 +02:00
Dmitriy Zaporozhets b99f841197 Update contribution acceptance criteria with tests requirements 2016-08-19 09:24:51 +00:00
Dmitriy Zaporozhets 15bbab880e Add test requirement for new files 2016-08-15 15:43:04 +00:00
Robert Speicher fa95d9e48b Merge branch 'dz-newlines-styleguide' into 'master'
Add newlines styleguide for Ruby code 

See merge request !5636
2016-08-08 23:29:56 +00:00
Timothy Andrew c78640890c Add migration-related tips to the "Merge Request Guidelines" doc
[ci-skip]
2016-08-08 08:43:19 +05:30
Dmitriy Zaporozhets 13cabe7184 Add newlines styleguide for Ruby code 2016-08-05 12:19:19 +03:00
Rémy Coutable f4c79d6a84 Merge branch 'coffescript_docs_migration' into 'master'
Update docs for CoffeeScript -> JavaScript.

## What does this MR do?
Removes some CoffeeScript docs and adds more JS ones

## Are there points in the code the reviewer needs to double check?
No

## Why was this MR needed?
To migrate some docs

## What are the relevant issue numbers?
#20098

## Screenshots (if relevant)
None

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5433
2016-08-04 11:41:52 +00:00
Job van der Voort 09257ce34c link the engineering workflow document from process and contributing 2016-08-02 13:40:41 +01:00
Jacob Schatz d6ebd4a3f7 Update docs for CoffeeScript -> JavaScript. 2016-07-22 20:13:46 -07:00
Mark Pundsack 81a34f2f56 Cleanup feature proposal template 2016-07-13 23:54:38 +00:00
Connor Shea 629b4e68e8
Add License Finder information to contribution acceptance criteria. 2016-06-07 11:23:26 -06:00
Achilleas Pipinellis ef85b8c329 Merge branch 'fix-design-link-in-contributing' into 'master'
Fix link to current design reference in the CONTRIBUTING guide

## What does this MR do?

It fixes an outdated link by replacing it with the up-to-date one.

See merge request !4439
2016-06-04 12:32:12 +00:00
Zeger-Jan van de Weg 7cc897d74e Let contributors know where to start
gitlab-org/gitlab-ce/issues/14905#note_12235996
2016-06-03 09:16:45 +00:00
Rémy Coutable bc351d5ac6
Fix link to current design reference in the CONTRIBUTING guide
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-02 18:10:16 +02:00
Rémy Coutable ea80259b48
Don't advertise the use of "ci skip" in the CONTRIBUTING guide
Now that we autoscale runner, we don't need to optimize for their usage
anymore. Abusing of "ci skip", for instance for view changes can lead to
broken specs, so let's just not use it!

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-01 14:18:37 +02:00
Douwe Maan 72e4bd5fc4 Merge branch 'feature-proposal-contribution-guidelines' into 'master'
feature proposal issue template in contributing guide

This adds a feature proposal template to the contribution guidelines for internal and external use.

Fixes #15448 

cc @markpundsack @stanhu @dzaporozhets 

See merge request !3967
2016-05-04 14:46:24 +00:00
Robert Speicher 3e43214ff6 Merge branch 'link-to-code-review-guide' into 'master'
Link to GitLab code review guide in contributing guidelines

I noticed that the contributing guidelines still link to the thoughtbot
code review guidelines even though we already have our own.

[ci skip]

See merge request !4018
2016-05-03 22:05:32 +00:00
Karlo Soriano 1fddfa8f2a Link to gitlab code review guide in contributing guidelines
I noticed that the contributing guidelines still link to the thoughtbot
code review guidelines even though we already have our own.

[ci skip]
2016-05-03 21:18:22 +08:00
Job van der Voort 52a6b976a7 feature proposal issue template in contributing guide 2016-04-28 14:13:39 +02:00
Achilleas Pipinellis da4aaaacd7 Fix links to core team page
[ci skip]
2016-04-28 14:06:28 +03:00
Achilleas Pipinellis 8b817f5940 Users can use the feature proposal label inside the issue
[ci skip]
2016-04-28 12:43:23 +03:00
Jacob Schatz 962979d32a Articles on proper commit messages 2016-04-20 07:32:45 -04:00
Robert Speicher fb8b0041d8 First pass at a Testing styleguide
[ci skip]
2016-04-01 20:31:12 -04:00
Douwe Maan 691d5db598 Change capitalization 2016-03-18 12:11:41 +00:00