6269f35b45
Improve & clean up the PROCESS.md doc
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-17 12:03:48 +01:00
4fd35cd58f
Removed rails 5 documentation
...
Because we removed rails 4 support, this document is not needed
anymore.
2018-12-14 18:58:12 +01:00
9714dfdfd0
Merge branch 'doc-prettier-vscode-settings' into 'master'
...
Update prettier.md with VSCode Settings section
See merge request gitlab-org/gitlab-ce!23810
2018-12-14 16:50:00 +00:00
c3d71eb3c4
Update prettier.md with VSCode Settings section
...
**Why?**
This is a recurring issue that new team members keep running into.
2018-12-14 08:29:56 -06:00
0ced372ecd
Add dplanella as Catalan proofreader
2018-12-14 06:41:25 +00:00
8028f2458d
Fix documentation for automatic merging
...
The strategy name and interval was incorrect, and the link back to the
developer documentation was in the wrong place.
2018-12-13 14:50:41 +01:00
8b7aa1e443
Update best_practices.md
2018-12-12 20:54:44 +00:00
78cad022cb
Document how to run rspec tests
2018-12-12 20:49:17 +00:00
40ad7d5d7a
Fix ActiveRecord::Migration deprecations
...
Extending from ActiveRecord::Migration is deprecated, but was still used
in a bunch of places.
2018-12-12 16:38:40 +01:00
5ee900ee9d
Merge branch 'docs/update-automatic-merge-documentation' into 'master'
...
Update automatic merging documentation
See merge request gitlab-org/gitlab-ce!23689
2018-12-12 13:30:01 +00:00
85102b59ee
Merge branch 'patch-35' into 'master'
...
Docs: Add spaces before code snippets in vuex.md
See merge request gitlab-org/gitlab-ce!23737
2018-12-12 13:05:33 +00:00
ceb7631ca5
Fix links to sections that were moved
2018-12-11 20:09:05 +00:00
00ba82487d
Add spaces before code snippets
2018-12-11 14:49:49 +00:00
98342b7f7f
Docs: how the global nav works
2018-12-11 13:39:37 +00:00
8d99636eff
Update automatic merging documentation
...
We're moving from merging + reverting to only merging with the `ours`
strategy, removing the need for merge requests or reverting conflicts.
For more details, refer to Merge Train merge request
https://gitlab.com/gitlab-org/merge-train/merge_requests/6 .
2018-12-11 14:03:06 +01:00
77849a2c1d
Merge branch 'docs/run-help-pages-tests' into 'master'
...
Document `/help` tests
See merge request gitlab-org/gitlab-ce!23469
2018-12-07 11:06:02 +00:00
7d564029e1
Merge branch 'docs-feature-flag-dev' into 'master'
...
Add section about enabling feature flag in development
See merge request gitlab-org/gitlab-ce!23634
2018-12-07 09:17:58 +00:00
180d937552
Provide information on /help rspec tests
2018-12-07 16:01:40 +10:00
e80f89337b
Merge branch '54610-allow-review-jobs-to-fail' into 'master'
...
Retry the review-{deploy,qa} jobs twice, and allow them to fail
Closes #54610 and #54717
See merge request gitlab-org/gitlab-ce!23510
2018-12-06 17:49:20 +00:00
d8e7e84d66
Add section about enabling feature flag in development
2018-12-06 16:46:12 +00:00
75ae3af19b
Add an 'How-To' section to the Review Apps doc
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-06 10:06:15 +01:00
676e0a3260
Remove mentions of Redash
...
Related links:
* https://gitlab.com/gitlab-com/Product/issues/5
* https://gitlab.com/meltano/looker/issues/294
2018-12-05 10:34:16 -08:00
519a840c8e
Update proofreader.md
2018-12-05 16:11:21 +01:00
0734ea64c4
Update proofreader.md
2018-12-05 16:10:20 +01:00
d133c874fa
Merge branch 'winh-add-jest' into 'master'
...
Setup Jest test environment
See merge request gitlab-org/gitlab-ce!23406
2018-12-05 10:43:38 +00:00
a8a13d3259
Setup Jest test environment
2018-12-05 09:24:42 +01:00
acd18a0900
Merge branch 'merge-train' into 'master'
...
Automatically merge CE master into EE master
See merge request gitlab-org/gitlab-ce!23453
2018-12-04 15:50:08 +00:00
191d5ab440
Updated documentation of CE to EE merges
...
This updates the documentation of automatic CE to EE merges to cover the
new automatic merging setup.
2018-12-04 14:40:08 +01:00
4bcec7439b
Merge branch 'master' into 'patch-28'
...
# Conflicts:
# doc/development/i18n/proofreader.md
2018-12-04 13:39:35 +00:00
b8a6d57bc8
Make docs about expect_next_instance_of consistent
...
So we compare `expect_any_instance_of` with
`expect_next_instance_of`, but still mention
`allow_any_instance_of`.
2018-12-03 21:18:59 +08:00
76d4e6d6d8
Merge branch 'patch-31' into 'master'
...
Update architecture.md
See merge request gitlab-org/gitlab-ce!23430
2018-12-03 10:17:45 +00:00
93d6f56968
Merge branch 'if-52811-fix_namespaces_api_routing' into 'master'
...
Fix API::Namespaces routing to accept namepaces with dots
See merge request gitlab-org/gitlab-ce!22912
2018-11-30 15:08:56 +00:00
bc3e68d537
Fix Red/Orange data link markdown
2018-11-30 15:07:06 +00:00
86bf2dd349
Merge branch 'docs/8608-update-approval-guidelines-to-include-red-orange-data-reviews' into 'master'
...
Add RED data security requirement to code review
See merge request gitlab-org/gitlab-ce!23426
2018-11-29 12:11:50 +00:00
f6e51e83a5
Merge branch 'mk/author-preparation-docs' into 'master'
...
Encourage MR author preparation in Code Review Guidelines documentation
See merge request gitlab-org/gitlab-ce!23360
2018-11-29 09:58:41 +00:00
901d078dc3
Merge branch 'fe-apollo-docs' into 'master'
...
Added frontend GraphQL docs
See merge request gitlab-org/gitlab-ce!23405
2018-11-29 09:10:10 +00:00
02314b8ae1
Update architecture.md
2018-11-29 03:37:03 +00:00
62fd842c65
Add RED data security requirement to code review
...
closes #8608
2018-11-28 15:19:45 -05:00
59b4db7f2c
Encourage MR author preparation
2018-11-28 10:37:17 -08:00
b1e070bf49
Fix API::Namespaces to accept namepaces with dots
...
It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to
API::NAMESPACE_OR_PROJECT_REQUIREMENTS
2018-11-28 12:54:11 +01:00
5e3076f2d7
Merge branch '50341-cleanup-useless-project-import-attributes' into 'master'
...
Removes all the irrelevant code and columns that were migrated from the Project…
See merge request gitlab-org/gitlab-ce!21497
2018-11-28 11:19:55 +00:00
cbfd6aced3
Left shift security in our workflow
2018-11-28 11:05:01 +00:00
e8db29d086
Merge branch '49570-add-review_qa-job' into 'master'
...
Add an automatic job to run QA smoke tests against Review Apps
Closes #49570
See merge request gitlab-org/gitlab-ce!22853
2018-11-28 10:39:56 +00:00
8cb6b66f3c
Merge branch 'more-guidelines-on-when-to-squash' into 'master'
...
Clearer docs when it is OK for maintainer to squash
See merge request gitlab-org/gitlab-ce!23376
2018-11-28 10:30:56 +00:00
24b4c1e8bf
Added frontend GraphQL docs
2018-11-28 10:00:03 +00:00
681d7139a9
Merge branch 'json-logging-for-k8s' into 'master'
...
Json logging for k8s Integration
See merge request gitlab-org/gitlab-ce!23328
2018-11-27 16:51:34 +00:00
8a6c2c97df
Merge branch 'docs/skip-auto-reconfigure' into 'master'
...
Replace deprecated skip-auto-migrations occurrence
Closes #45031
See merge request gitlab-org/gitlab-ce!23326
2018-11-27 16:35:19 +00:00
d933731ae9
Merge branch 'docs/fix-some-grammar' into 'master'
...
Fix minor grammar issues
See merge request gitlab-org/gitlab-ce!23372
2018-11-27 13:19:44 +00:00
4bd8a427d4
Removes all the irrelevant import related code and columns
...
Clears the import related columns and code from the Project
model over to the ProjectImportState model
2018-11-27 12:58:13 +00:00
367a0e8914
Clearer docs when it is OK for maintainer to squash
2018-11-27 11:55:01 +01:00
Rémy Coutable
Jan Provaznik
Filipa Lacerda
Paul Slaughter
David Planella
Yorick Peterse
Sam Bigelow
Marcia Ramos
Michael Kozono
Sylhare
Achilleas Pipinellis
Douwe Maan
Evan Read
Douglas Barbosa Alexandre
Clement Ho
Stan Hu
Maksymilian Roman
Jeongwhan Choi
Mike Greiling
Winnie Hellmann
Lin Jen-Shin
Nick Thomas
Philippe Lafoucrière
B1nj0y
Philippe Lafoucrière
Imre Farkas
Sean McGivern
Dmitriy Zaporozhets
Phil Hughes
Tiago Botelho
Dylan Griffith