Commit Graph

1037 Commits

Author SHA1 Message Date
Alexis Reigel ( 🌴 may 2nd - may 9th 🌴 ) 9b33e3d36f Display and revoke active sessions 2018-05-02 08:08:16 +00:00
Mike Greiling 6b1e4ad5e8 Fix memory and performance issues in Karma test suite 2018-05-01 17:40:35 +00:00
Clement Ho 2272e95acd Merge branch 'master' into 'bootstrap4'
# Conflicts:
#   app/views/ci/variables/_variable_row.html.haml
2018-04-30 16:13:13 +00:00
Douwe Maan 7275c225f1 Merge branch '43614-osw-diff-docs' into 'master'
Add developer documentation on diff handling and limits

Closes #43614

See merge request gitlab-org/gitlab-ce!18269
2018-04-30 15:34:12 +00:00
Oswaldo Ferreira 5e0a2db706 Add developer documentation on diff handling and limits 2018-04-30 11:16:29 -03:00
Pascal Borreli 12e3eff462 Fixed typos 2018-04-27 08:50:05 +00:00
Clement Ho 9cc1294d27 Merge branch 'master' into bootstrap4 2018-04-26 15:55:32 -05:00
Victor Wu 4677186908 Remove link to object state model 2018-04-26 09:06:33 +01:00
Victor Wu 9c39ea8326 Delete object_state_models.md 2018-04-25 15:55:38 +00:00
Clement Ho 56982fcf24 Merge branch 'master' into bootstrap4 2018-04-25 10:51:53 -05:00
Clement Ho b173e56461 Merge branch '30998-add-babel-rewire-plugin' into 'master'
Resolve "Add some way to mock and spy on default ES modules"

Closes #30998

See merge request gitlab-org/gitlab-ce!18116
2018-04-24 14:00:59 +00:00
Clement Ho 0d77b9c9ff Merge branch 'master' into 'bootstrap4'
# Conflicts:
#   app/views/projects/jobs/index.html.haml
2018-04-24 00:21:38 +00:00
Michael Kozono 407a800456 Add Capybara debugging methods to docs 2018-04-23 19:52:45 +00:00
Clement Ho 8bd38fdc25 Merge branch 'master' into bootstrap4 2018-04-23 08:51:42 -05:00
Rémy Coutable 5b44097cf7
Address latest feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-23 13:02:07 +02:00
Rémy Coutable fe919f95b1
Document the new 'spec/fast_spec_helper.rb' file
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-23 12:20:30 +02:00
Rémy Coutable 023d4f6f2f
Move spec helpers/matchers/shared examples/contexts to their relevant folder
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-23 12:20:30 +02:00
Mike Greiling 44783480be
document the spyOnDependency method 2018-04-23 00:54:21 -05:00
blackst0ne 92acc46381 Add missing changelog type to docs 2018-04-23 15:09:48 +11:00
Clement Ho cefeeaea33 Merge branch 'master' into bootstrap4 2018-04-19 13:43:06 -05:00
Tim Zallmann 4be581637c Documentation: Frontend Building Checklist 2018-04-19 18:36:17 +00:00
Mek Stittri 31d242d8c3 Merge branch 'docs/gb/rename-qa-slack-channel-to-quality' into 'master'
Rename #qa slack channel to #quality in docs

See merge request gitlab-org/gitlab-ce!18472
2018-04-19 16:55:41 +00:00
Clement Ho 1536c69f6a Convert fixTitle to _fixTitle for regenerating tooltip titles 2018-04-19 10:40:23 -05:00
Dennis Tang 3a7c148d0b Fix typo in vue.md 2018-04-19 12:04:15 +00:00
Grzegorz Bizon 27a5deea38 Rename #qa slack channel to #quality in docs 2018-04-19 09:28:08 +02:00
Sean McGivern 3772310423 Add more detail to cleanup steps for background migrations
1. We can't just steal from the queue, in case there was a problem with Sidekiq.
2. We need to consider import / export.
2018-04-18 11:06:59 +01:00
Marcia Ramos d8cd3f4bf1 update badges guidelines 2018-04-17 13:35:42 -03:00
Marcia Ramos a9c32fe099 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into docs-add-badges 2018-04-17 12:38:04 -03:00
Rémy Coutable 423d0ba216 Merge branch 'tokiuji-update-proofreader.md' into 'master'
Add @tokiuji as Japanese proofreader

See merge request gitlab-org/gitlab-ce!18382
2018-04-17 12:03:21 +00:00
Dennis Tang 05375ee689 FE Docs: Fix header hierarchy in Vuex section of Vue.md 2018-04-16 20:39:58 +00:00
Marcia Ramos 2654905ad5 document how badges work 2018-04-16 14:33:52 -03:00
Yamana Tokiuji ab15622c05 Update proofreader.md
Request Japanese proofreader permissions
2018-04-14 02:21:26 +00:00
Clement Ho da6933883f Merge branch 'docs-graphs-section-new-frontend-guide' into 'master'
Update the new frontend guide to specify the usage of d3

See merge request gitlab-org/gitlab-ce!18294
2018-04-12 17:32:21 +00:00
Jose Ivan Vargas e3eeb3cb7e Added d3 documentation for the new fe guide 2018-04-12 12:21:09 -05:00
Clement Ho 8206cae781 Merge branch 'winh-sprintf-no-escape-docs' into 'master'
Document example for sprintf without escaping

See merge request gitlab-org/gitlab-ce!16712
2018-04-11 17:55:28 +00:00
Clement Ho 54691d3d44 Merge branch 'winh-single-karma-test' into 'master'
Add possibility to filter Karma spec files by path

Closes #40899

See merge request gitlab-org/gitlab-ce!16102
2018-04-11 17:18:09 +00:00
Winnie Hellmann a58ddd7a94 Document example for sprintf without escaping 2018-04-11 14:15:49 +02:00
Lukas Eipert bd1b2c665f
use commander for safer cli argument parsing 2018-04-11 00:34:18 +02:00
Lukas Eipert 029180f016
add documentation for karma testing with specific files/folders 2018-04-10 12:03:46 +02:00
Jacob Vosmaer (GitLab) 3717deae1e Document process for new Git features 2018-04-10 09:31:31 +00:00
Riccardo Padovani f68aab1945 Make email handler clearer 2018-04-09 09:39:03 +00:00
Andreas Brandl 2d273d7bd1 Performance improvements warrants a changelog entry. 2018-04-06 12:31:38 +02:00
Filipa Lacerda 703f456322 Update vuex.md 2018-04-06 08:38:19 +00:00
Filipa Lacerda 44376b3007
Changes after review 2018-04-04 20:15:04 +01:00
Filipa Lacerda 85b45ce94d [ci skip] Merge branch 'master' into 44427-state-management-with-vuex
* master: (544 commits)
  Bulk deleting refs is handled by Gitaly by default
  Allow assigning and filtering issuables by ancestor group labels
  Fix links to subdirectories of a directory with a plus character in its path
  Add banzai filter to detect commit message trailers and properly link the users
  Render MR commit SHA instead "diffs" when viable
  Fix a transient failure by removing unneeded expectations
  Revert changelog entry for removed feature
  Revert "Allow CI/CD Jobs being grouped on version strings"
  Add support for Sidekiq JSON logging
  Resolve "Protected branches count is wrong when a wildcard includes several protected branches"
  Remove unused form for admin application settings
  Use standard codequality job
  Resolve "Allow the configuration of a project's merge method via the API"
  Move the rest of application settings to expandable blocks
  [Rails5] Rename `sort` methods to `sort_by_attribute`
  Add better LDAP connection handling
  Updated components to PascalCase
  Handle invalid params when trying update_username
  Move network related app settings to expandable blocks
  [Rails5] Update Gemfile.rails5.lock [ci skip]
  ...
2018-04-04 20:04:39 +01:00
Tim Zallmann be1523c1ba Merge branch 'add-documentation-about-backporting-changes' into 'master'
Add documentation about backporting changes from EE to CE

See merge request gitlab-org/gitlab-ce!18003
2018-04-03 13:42:24 +00:00
Rémy Coutable 160d29b869 Merge branch '44752-remove-ee-specific-comments' into 'master'
Remove EE-specific comment markers from CE

Closes #44752

See merge request gitlab-org/gitlab-ce!18054
2018-03-28 18:12:20 +00:00
Eric Eastwood d5f0d89f9d Remove EE-specific comments from CE 2018-03-28 11:05:14 -05:00
Clement Ho 0e6b8a2b30 Add JavaScript style guide 2018-03-28 14:43:20 +00:00
Rémy Coutable 78f3ac085d Merge branch 'docs-extract-ee-api' into 'master'
Document a few strategies to extract EE APIs

See merge request gitlab-org/gitlab-ce!17573
2018-03-28 14:40:05 +00:00
André Luís 1dc43af6ff Add doc about backporting changes from EE to CE 2018-03-26 17:46:03 +00:00
Lin Jen-Shin 77d1f73ec1 Clarify what rules we should follow for naming 2018-03-26 15:42:19 +08:00
Robert Speicher 378d0c49e8 Copyedit doc/development/ee_features.md 2018-03-23 16:52:20 -05:00
Sean McGivern 32614419e0 Merge branch 'patch-1' into 'master'
Request Chinese Traditional proofreader permissions.

See merge request gitlab-org/gitlab-ce!17762
2018-03-23 13:43:15 +00:00
Brett Walker 7b0e7bcf5d make a little more obvious what operations might need downtime or enhanced migration techniques 2018-03-22 16:08:21 +00:00
Filipa Lacerda dd3b1526af
Fixes typos and adds mutations examples 2018-03-22 10:50:52 +00:00
Filipa Lacerda fef1e9d47b
Improve state management documentation 2018-03-22 10:25:03 +00:00
Sean McGivern 36f49305e1 Merge branch 'docs/clarify-mail-room-procfile-location' into 'master'
Clarify location of Procfile for mail_room

See merge request gitlab-org/gitlab-ce!17896
2018-03-21 17:29:14 +00:00
Eric Eastwood 152e6b73ca Launch mail_room manually and remove foreman reference 2018-03-21 11:52:05 -05:00
Yorick Peterse 9b4a1db997 Merge branch 'ab-43887-concurrent-migration-helpers' into 'master'
Convenient use of concurrent migration helpers

Closes #43887

See merge request gitlab-org/gitlab-ce!17888
2018-03-21 14:47:10 +00:00
Clement Ho 7887835561 Merge branch 'docs-fe-monitoring' into 'master'
Add performance monitoring docs for the new FE guide

See merge request gitlab-org/gitlab-ce!17809
2018-03-20 23:15:24 +00:00
Jose Ivan Vargas 9eb30418c6 Added monitoring docs 2018-03-20 17:07:43 -06:00
Andreas Brandl 1362d9fe13 Shortcut concurrent index creation/removal if no effect.
Index creation does not have an effect if the index is present already.
Index removal does not have an affect if the index is not present.

This helps to avoid patterns like this in migrations:
```
if index_exists?(...)
  remove_concurrent_index(...)
end
```
2018-03-20 18:44:00 +01:00
Toon Claes 88dffa45ce Rename `package-qa` in docs
In gitlab-org/gitlab-ce!17807 the `package-qa` job was renamed to
`package-and-qa`. But it was not renamed in the docs. So this change
fixes that.
2018-03-19 10:04:23 +01:00
Marcia Ramos 536e57d54f Docs: refactor doc general guidelines and style guidelines 2018-03-16 14:59:56 +00:00
Clement Ho 4161e1f180 Rename style to style guide in new frontend guide 2018-03-15 19:58:50 +00:00
Clement Ho b449e674b8 Add HTML style guide 2018-03-15 12:05:32 +00:00
Clement Ho e4b6d259ee Add frontend guide principles 2018-03-15 11:49:52 +00:00
d.weizhe@gmail.com 9d14dc820e Reques Chinese Traditional proofreader permissions. 2018-03-15 01:42:32 +00:00
Douwe Maan 310126978e Merge branch 'patch-24' into 'master'
Add me as proofreader

See merge request gitlab-org/gitlab-ce!17593
2018-03-14 21:30:21 +00:00
Douwe Maan bbfe8d8c70 Merge branch 'patch-30' into 'master'
add Indonesian proofreader

See merge request gitlab-org/gitlab-ce!17579
2018-03-14 21:23:00 +00:00
Tim Zallmann 51e454f3b1 Prettier Phase 1: Prettier Configuration, Prettifying of files and documentation 2018-03-14 19:32:36 +00:00
Tim Zallmann dfed7b4575 Merge branch 'docs-fe-security' into 'master'
Add frontend security documentation

See merge request gitlab-org/gitlab-ce!17622
2018-03-13 13:34:48 +00:00
Mike Greiling f3d3a4719d
move tip into blockquote 2018-03-12 18:00:44 -05:00
Mike Greiling 9f9257fa5a
specify that webpack entry points are exempt from unit tests, not integration tests 2018-03-12 17:51:01 -05:00
Mike Greiling d92baff68f
address wording feedback 2018-03-12 17:42:38 -05:00
Mike Greiling 43ceaf494f
update node and yarn dependencies within install/upgrade docs 2018-03-12 15:51:53 -05:00
Mike Greiling 06a07e1288
update EE features frontend section to point to performance.md for info on page-specific EE code 2018-03-12 15:51:52 -05:00
Mike Greiling 6cfd38e512
differentiate image lazy-loading from code splitting 2018-03-12 15:33:32 -05:00
Mike Greiling 66ee5b0117
emphasize headings for each page-specific-javascript tip 2018-03-12 15:31:28 -05:00
Mike Greiling ae47afb9fd
add section for universal code 2018-03-12 15:24:55 -05:00
Mike Greiling ab8ad58ea1
rewrite docs for page-specific-javascript 2018-03-12 15:19:19 -05:00
Tim Zallmann a77ba547ff Merge branch 'fl-document-key-vue' into 'master'
Adds guidelines regarding `:key` keyword

See merge request gitlab-org/gitlab-ce!17400
2018-03-12 12:39:13 +00:00
Filipa Lacerda 4a7d623065
Updates file extensions on Vue docs 2018-03-12 10:08:58 +00:00
Clement Ho c58dc4c974 Rename VUE JS to Vue 2018-03-08 16:02:17 +00:00
Clement Ho 8f17a25c5b Add frontend security documentation 2018-03-07 14:39:29 -06:00
Clement Ho aaea45cdaf Fix accessibility typo 2018-03-07 12:55:08 -06:00
Jacob Schatz 22198466ca Merge branch 'docs-new-fe-guide' into 'master'
Add new frontend guide structure

See merge request gitlab-org/gitlab-ce!17611
2018-03-07 18:51:36 +00:00
Clement Ho 04c7083ac9 Add new frontend guide structure 2018-03-07 12:32:38 -06:00
ChangHo Cha 20d2bf2a06 Add me as proofreader 2018-03-07 10:02:54 +00:00
Ahmad Naufal Mukhtar 37161c6a49 add Indonesian proofreader 2018-03-06 19:22:18 +00:00
Lin Jen-Shin 65650bc0be Document a few strategies to extract EE APIs 2018-03-07 01:10:55 +08:00
Marcia Ramos 9ede3a669c Docs guidelines: cherry-picking commits from CE to EE 2018-03-06 16:34:05 +00:00
Stan Hu 8a0052c037 Merge branch 'patch-1' into 'master'
Update proofreader.md

See merge request gitlab-org/gitlab-ce!17503
2018-03-03 21:47:56 +00:00
Yorick Peterse 0a2a4ed081 Merge branch 'docs/spring-db-migration-error' into 'master'
Add docs for persistent `ActiveRecord::PendingMigrationError` with Spring

See merge request gitlab-org/gitlab-ce!17473
2018-03-03 16:15:27 +00:00
Filip Mech 0bba60f52c Update proofreader.md 2018-03-03 12:09:57 +00:00
Lin Jen-Shin 5928b0c298 Update incoming emails documents 2018-03-02 19:51:08 +08:00
Eric Eastwood 249400fb4f Add docs for persistent `ActiveRecord::PendingMigrationError` with Spring 2018-03-01 17:51:37 -06:00
Filipa Lacerda d6079adc09 Merge branch 'winh-fix-vuex-docs' into 'master'
Small fixes in Vuex docs

See merge request gitlab-org/gitlab-ce!17471
2018-03-01 21:19:41 +00:00
Winnie Hellmann 0308932e0a Small fixes in Vuex docs 2018-03-01 20:48:58 +01:00
Sean McGivern 1c2b633b1f Merge branch 'docs-document-the-ee-files-location-check-job' into 'master'
Document the ee-files-location-check CI job

Closes #43711

See merge request gitlab-org/gitlab-ce!17451
2018-03-01 12:14:35 +00:00
Rémy Coutable ad8cd349e7
Document the ee-files-location-check CI job
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-03-01 13:08:57 +01:00
Tim Zallmann 1639315735 Merge branch 'docs-anim-perf' into 'master'
Add animation performance guide to frontend docs

See merge request gitlab-org/gitlab-ce!17234
2018-03-01 11:58:07 +00:00
Filipa Lacerda 30264317eb
Clean up docs 2018-03-01 11:14:08 +00:00
Filipa Lacerda d7b3a71119
Adds information about nested v-for 2018-02-28 18:32:04 +00:00
Filipa Lacerda 524c3c8828 Merge branch 'master' into fl-document-key-vue
* master: (41 commits)
  Remove cycle analytics bundle webpack entry point
  Replace whitespace demonstrating line-breaks in GFM docs
  Remove pipelines mini graph spec that wasn't actually testing anything
  Change the wording to reduce confusion about whether you need to reconfigure or restart.
  Add Assignees vue component missing data container
  Set security harness hook to executable after creation
  Fix for open-ended parameter's in lograge causing elastic memory issues
  Docs: explain feature availability in GitLab.com
  Patch 29
  PagesDomain: improve breadcrumbs
  PagesDomain: Add edit/update functionality
  Add new job variables: CI_RUNNER_{REVISION,VERSION,EXECUTABLE_ARCH}
  Re-enable the remaning Wiki Gitaly-Endpoints
  Labels Select Tests
  Fix unnecessary spacing between labels
  Add changelog entry
  Make label filter URL dynamic
  Move the remaining EE-specific JS files to ee/
  Specify base controller for Doorkeeper
  Fix example in Vuex docs
  ...
2018-02-28 18:24:28 +00:00
Rémy Coutable 31b5b27ffd Add Rémy Coutable as a French proofreader
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-28 19:08:20 +01:00
Rémy Coutable df029d4f73 Improve the Translation/Externalization documentation
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-28 19:08:20 +01:00
Filipa Lacerda 089236976b Fix example in Vuex docs 2018-02-28 10:59:48 +00:00
Filipa Lacerda f87d7e9094
Fix typos 2018-02-27 21:28:57 +00:00
Filipa Lacerda b47cd96904
Adds guidelines regarding `:key` keyword 2018-02-27 18:52:54 +00:00
Marcia Ramos 650d11beb4 Docs: search/replace "Enterprise Edition" and adjust when applicable 2018-02-22 16:13:35 +00:00
Connor Shea 9f79e6efc2 No `../` is necessary for linking pages in the same directory. 2018-02-21 23:32:17 +00:00
James Ramsay f6a1c7ffda Link directly to proofreader.md 2018-02-21 18:16:15 -05:00
James Ramsay 4104ab0554 Add more detail to the proofreader process 2018-02-21 17:42:27 -05:00
Rémy Coutable 91f03a7ab2 Generate EE changelog under ee/changelogs/unreleased/
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-20 16:12:48 +01:00
Marcia Ramos 4e46909015 Docs: Pages - clean up articles 2018-02-20 14:57:36 +00:00
Achilleas Pipinellis 7e83993ded Merge branch '43376-follow-up-from-docs-update-all-articles-with-the-new-layout-metadata-from-the-frontmatter' into 'master'
Resolve "Follow-up from "Docs: Update all articles with the new layout (metadata from the frontmatter)""

Closes #43376

See merge request gitlab-org/gitlab-ce!17214
2018-02-20 14:33:19 +00:00
Simon Knox cccde4b1ca Add animation performance guide to frontend docs 2018-02-20 10:31:28 +00:00
Rémy Coutable 236dcbcbee Merge branch 'docs/rs-changelog-doc-links' into 'master'
Update two links in the changelog developer docs

See merge request gitlab-org/gitlab-ce!17220
2018-02-19 23:51:50 +00:00
Marcia Ramos 6be8cd2293 specify date format 2018-02-19 14:22:00 +00:00
Robert Speicher 13074cab02 Update two links in the changelog developer docs 2018-02-18 13:48:28 -06:00
Marcia Ramos d54a80ca3a Update all articles with the new layout (meta data from the frontmatter)
Context: https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/182
2018-02-16 16:01:35 -02:00
Filipa Lacerda 241ece8775 Merge branch 'docs-axios' into 'master'
Add axios to frontend docs as the default network request library

See merge request gitlab-org/gitlab-ce!17165
2018-02-16 10:52:54 +00:00
Dylan Griffith bda4f0811e Improve error handling for Gitlab::Profiler and improve doc about providing a user 2018-02-16 19:47:44 +11:00
Clement Ho 4634e3a109 Add axios to frontend docs as the default network request library 2018-02-15 17:19:54 -06:00
Winnie Hellmann 05f66d1342 Add new modal Vue component 2018-02-14 19:57:07 +01:00
Achilleas Pipinellis c896ad8a23 Merge branch 'feature-flags-for-user-apps' into 'master'
clarify what kind of feature flags we support

See merge request gitlab-org/gitlab-ce!17113
2018-02-14 15:06:43 +00:00
Job van der Voort 5e2c1778c2 clarify what kind of feature flags we support 2018-02-14 12:40:06 +00:00
James Ramsay 97988590a8 Fix punctuation and address feedback 2018-02-13 21:51:12 +00:00
James Ramsay 6377228717 Add clearer proofreader process to docs 2018-02-13 21:10:42 +00:00
Yorick Peterse dd8f56e862 Merge branch 'whitelisting' into 'master'
Remove Sentry reporting for query limiting

See merge request gitlab-org/gitlab-ce!17092
2018-02-13 17:50:19 +00:00
Robert Speicher 480b957e94 Merge branch 'ce-rc/move-all-ee-specs-to-ee-specs' into 'master'
Port spec/fixtures/api/schemas/deployment.json from EE

See merge request gitlab-org/gitlab-ce!17090
2018-02-13 16:46:37 +00:00
Yorick Peterse e3bd674e81
Remove Sentry reporting for query limiting
Using Sentry, while useful, poses two problems you have to choose from:

1. All errors are reported separately, making it easy to create issues
   but also making it next to impossible to see other errors (due to the
   sheer volume of threshold errors).

2. Errors can be grouped or merged together, reducing the noise. This
   however also means it's (as far as I can tell) much harder to
   automatically create GitLab issues from Sentry for the offending
   controllers.

Since both solutions are terrible I decided to go with a third option:
not using Sentry for this at all. Instead we'll investigate using
Prometheus alerts and Grafana dashboards for this, which has the added
benefit of being able to more accurately measure the behaviour over
time.

Note that throwing errors in test environments is still enabled, and
whitelisting is still necessary to prevent that from happening (and that
in turn still requires that developers create issues).
2018-02-13 17:26:59 +01:00
Rémy Coutable 2bdb578032
Port some RuboCop and doc changes from EE
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-13 16:33:00 +01:00
Dylan Griffith bbcc18080b Update sidekiq_style_guide.md 2018-02-13 05:10:04 +00:00
Dylan Griffith e8648270af Document all_queues.yml in sidekiq_style_guide.md 2018-02-13 16:08:02 +11:00
Phil Hughes 721fab661d Merge branch 'doc-improve-side-effects-block' into 'master'
Improve docs about allowing some side effects on the constructor

See merge request gitlab-org/gitlab-ce!17027
2018-02-09 17:50:41 +00:00
Filipa Lacerda ee8ac683f7 Fix english in style_guide_js.md 2018-02-09 12:01:05 +00:00
Filipa Lacerda c5a3dfe1a6
Improve docs about allowing some side effects on the constructor 2018-02-09 10:53:07 +00:00
George Tsiolis 469148b231 Update vue component naming guidelines 2018-02-08 21:20:54 +02:00
Achilleas Pipinellis 920f71a03c Merge branch 'bvl-pot-merge-conflicts-docs' into 'master'
Add a note about merge conflicts in `gitlab.pot`

See merge request gitlab-org/gitlab-ce!16971
2018-02-08 11:50:54 +00:00
Yorick Peterse 07e1bcc076 Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'
Fix concurrent fork network migrations

Closes #41487

See merge request gitlab-org/gitlab-ce!16988
2018-02-08 11:22:04 +00:00
Simon Knox 801f5205cd Update style_guide_scss.md 2018-02-08 09:28:38 +00:00
Bob Van Landuyt 917fb1744c [docs] Info rescheduling background migrations 2018-02-08 09:44:59 +01:00
Bob Van Landuyt c807a79979 Add a note about merge conflicts in `gitlab.pot` 2018-02-07 14:24:47 +01:00
Jarka Kadlecová a39dc76645 Translate issuable sidebar 2018-02-07 14:05:57 +01:00
Shinya Maeda efd30ba5ea update doc 2018-02-06 15:50:08 +09:00
Rémy Coutable 4d64524b0d Merge branch 'query-counts' into 'master'
Track and act upon the number of executed SQL queries

See merge request gitlab-org/gitlab-ce!16466
2018-02-05 10:04:43 +00:00
Micaël Bergeron 2057a6acde port of 594e6a0a625^..f74c90f68c6 2018-02-01 12:14:46 -05:00