summaryrefslogtreecommitdiff
path: root/doc/development/README.md
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-05-03 12:27:16 -0300
committerMarcia Ramos <virtua.creative@gmail.com>2017-05-03 12:27:16 -0300
commit17d5b333af19ccab3685592082740ad1db0e2fb4 (patch)
tree280d52a6b0ec4e438013c5d293a5e0eda99ae572 /doc/development/README.md
parentdd91260899912956534ffffda2272053668c8f68 (diff)
parentc33c23104246b14f25d4c535e7f153a0cb389f7f (diff)
downloadgitlab-ce-new-docs-topic-issues.tar.gz
Merge branch 'new-docs-topic-issues' of gitlab.com:gitlab-org/gitlab-ce into new-docs-topic-issuesnew-docs-topic-issues
Diffstat (limited to 'doc/development/README.md')
-rw-r--r--doc/development/README.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/development/README.md b/doc/development/README.md
index 3f2151bbe8e..6f2ca7b8590 100644
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -14,13 +14,15 @@
contributing to documentation.
- [SQL Migration Style Guide](migration_style_guide.md) for creating safe SQL migrations
- [Testing standards and style guidelines](testing.md)
-- [UI guide](ui_guide.md) for building GitLab with existing CSS styles and elements
+- [UX guide](ux_guide/index.md) for building GitLab with existing CSS styles and elements
- [Frontend guidelines](frontend.md)
- [SQL guidelines](sql.md) for working with SQL queries
- [Sidekiq guidelines](sidekiq_style_guide.md) for working with Sidekiq workers
## Process
+- [Generate a changelog entry with `bin/changelog`](changelog.md)
+- [Limit conflicts with EE when developing on CE](limit_ee_conflicts.md)
- [Code review guidelines](code_review.md) for reviewing code and having code reviewed.
- [Merge request performance guidelines](merge_request_performance_guidelines.md)
for ensuring merge requests do not negatively impact GitLab performance
@@ -36,6 +38,7 @@
- [Rake tasks](rake_tasks.md) for development
- [Shell commands](shell_commands.md) in the GitLab codebase
- [Sidekiq debugging](sidekiq_debugging.md)
+- [Object state models](object_state_models.md)
## Databases