Commit Graph

784 Commits

Author SHA1 Message Date
Filipa Lacerda 0f5f77a04c Merge branch 'winh-axios-mock-restore' into 'master'
Use restore() instead of reset() for removing axios MockAdapter

See merge request gitlab-org/gitlab-ce!16647
2018-01-24 09:50:39 +00:00
Winnie Hellmann 9e28ca9d47 Document advantages of axios-mock-adapter 2018-01-23 12:10:36 +00:00
Winnie Hellmann 0711ebbd72 Use restore() instead of reset() for removing axios MockAdapter 2018-01-23 12:42:02 +01:00
Rémy Coutable 11463bf9ec Merge branch 'add-js-note-live-debug' into 'master'
Add note about live_debug only working on javascript enabled specs

See merge request gitlab-org/gitlab-ce!16625
2018-01-23 09:03:24 +00:00
Stan Hu c2c6ce076a Merge branch 'add-profiler-to-application' into 'master'
Add Gitlab::Profiler for profiling from a console or runner

See merge request gitlab-org/gitlab-ce!16552
2018-01-22 18:49:28 +00:00
Clement Ho b593565538 Add note about live_debug only working on javascript enabled specs 2018-01-22 17:50:39 +00:00
Achilleas Pipinellis e3716e0f33 Merge branch 'patch-28' into 'master'
Update best_practices.md

See merge request gitlab-org/gitlab-ce!16579
2018-01-19 18:45:59 +00:00
Achilleas Pipinellis 9fb5bd416d Merge branch 'spelling' into 'master'
doc: Spelling fixes

See merge request gitlab-org/gitlab-ce!16575
2018-01-19 18:44:23 +00:00
Sean McGivern 45d6a2b398 Add bin/profile-url tool and docs 2018-01-19 14:59:05 +00:00
Anwar El Wakil 408e3cc1c4 Update best_practices.md
Remove duplicate list item in "General Guidelines" Section.
2018-01-19 13:15:35 +00:00
Ville Skyttä 0cbbb08e79 doc: Spelling fixes 2018-01-19 12:09:59 +02:00
Tom Bosmans d29defd2a4 Fixes mistake in change log doc. 2018-01-18 08:32:26 +00:00
Rémy Coutable b82c4f1b33 Merge branch 'master' into 'master'
Fix typo in doc_styleguide.md

See merge request gitlab-org/gitlab-ce!16481
2018-01-16 14:08:23 +00:00
Marcia Ramos 228ff2c979 Docs: document new redirect for Disqus comments 2018-01-16 09:20:39 +00:00
Mica d542099583 Fix typo in doc_styleguide.md 2018-01-15 23:57:13 +00:00
Lin Jen-Shin fd54d7a2b6 Add some more docs to doc/development/utilities.md 2018-01-12 19:44:00 +08:00
Lin Jen-Shin cfd75101d1 Merge remote-tracking branch 'upstream/master' into 1819-override-ce
* upstream/master: (621 commits)
  Add a note about GitLab QA page objects validator to docs
  Refactor dispatcher projects blame and blob path
  Update export message to mention we can download the file from the UI
  Fix Ctrl+Enter keyboard shortcut saving comment/note edit
  fix case where tooltip messes up :last-child selector
  Add reason to keep postgresql 9.2 for CI
  Remove warning noise in ProjectImportOptions
  Add changelog entry
  Add RedirectRoute factory
  Update Ingress extra cost note to be more generic
  Fix Rubocop offense
  Refactor dispatcher project branches path
  Revert "Revert "Fix Route validation for unchanged path""
  Document that we need rsync for backing up
  Docs: move article "Laravel and Envoy w/ CI/CD"
  Recommend against the use of EFS
  Adds Rubocop rule for line break around conditionals
  Update CHANGELOG.md for 10.1.6
  Filter out build traces from logged parameters
  Refactored project:n* imports in dispatcher.js
  ...
2018-01-12 19:43:38 +08:00
Andrew Newdigate 0cc25f0f1b Update end_to_end_tests.md 2018-01-11 12:05:55 +00:00
Phil Hughes 249b5015d7 Merge branch '34312-eslint-vue-plugin' into 'master'
Resolve "Add eslint-vue-plugin to our stack"

Closes #34312

See merge request gitlab-org/gitlab-ce!16210
2018-01-10 14:35:34 +00:00
Achilleas Pipinellis 3d8c898a90 Merge branch 'docs/rs-fix-changelog-header-level' into 'master'
Fix the header level for the Changelog Arguments documentation

See merge request gitlab-org/gitlab-ce!16158
2018-01-09 13:17:05 +00:00
Filipa Lacerda 601dc0d8b3
Fix broken specs 2018-01-09 11:58:34 +00:00
Achilleas Pipinellis 4eae806af4 Merge branch 'doc-development-architecture.md-remove-unnecessary-line' into 'master'
Fix: remove unnecessary line

Closes #41501

See merge request gitlab-org/gitlab-ce!16289
2018-01-09 11:31:51 +00:00
Filipa Lacerda e2b759a2f4
Merge branch 'master' into 34312-eslint-vue-plugin
* master: (140 commits)
  Add Gitter room link to I want to contribute since you always have questions
  Use workhorse 3.4.0
  chore: remove symbolic link
  Add memoization for properties
  Resolve "Allow QA tests to run with `CHROME_HEADLESS=false`"
  Resolve "Add graph value to hover"
  Fix slash commands dropdown description
  disables the shortcut to the issue boards when issues are disabled
  Fix static analysys
  Disable STI of ActiveRecord. Refactoring specs.
  Fix StaticSnalysys
  Fix change log
  Add changelog
  Revert bulk_insert and bring back AR insert(one by one)
  Add a new test for emptified params
  Use batch update for Service deactivation
  Fix query to look for proper unmanaged kubernetes service
  Fix static anylysy
  Use bulk_insert instead of AR create
  Opitmize migration process by using both unmanaged_kubernetes_service and kubernetes_service_without_template
  ...
2018-01-08 19:19:52 +00:00
Annabel Dunstone Gray 5e9c8906c0 Merge branch '41744-substitute-ui-charcoal-with-ui-indigo' into 'master'
Substitute ui_charcoal theme deprecated by GitLab Theme (10.0) with ui_indigo

Closes #41744

See merge request gitlab-org/gitlab-ce!16271
2018-01-08 18:19:34 +00:00
Onuwa Nnachi Isaac 97311688b5 Fix: remove unnecessary line 2018-01-08 18:11:25 +01:00
Robert Speicher 83ae8efa4e Merge branch 'docs/typo-writing-documentation' into 'master'
Fix typo in writing_documentation.md

See merge request gitlab-org/gitlab-ce!16276
2018-01-08 15:40:14 +00:00
Takuya Noguchi 13be4f49f8 Substitute deprecated ui_charcoal with new default ui_indigo 2018-01-07 13:50:40 +09:00
Filipa Lacerda 2a31a850c4
Merge branch 'master' into 34312-eslint-vue-plugin
* master: (78 commits)
  Use --left-right and --max-count for counting diverging commits
  API: get participants from merge_requests & issues
  Copy Mermaid graphs as GFM
  Rephrase paragraph about e2e tests in merge requests in docs
  Remove EE only sections from docs
  Update redis-rack to 2.0.4
  Refactor matchers for background migrations
  Add id to modal.vue to support data-toggle="modal"
  Allow local tests to use a modified Gitaly
  Fix specs
  Use computed prop in expand button
  Update check.md
  add deprecation and removal issue to docs
  Add status attribute to runner api entity
  Fix typos in a code comment
  Refactor RelativePositioning so that it can be used by other classes
  Backport 'Rebase' feature from EE to CE
  Just try to detect and assign once
  Fix custom name in branch creation for issue in Firefox
  Modify `LDAP::Person` to return username value based on attributes
  ...
2018-01-05 18:22:07 +00:00
Rémy Coutable 780cc843df Merge branch 'docs/qa/gb/document-integration-tests-in-merge-requests' into 'master'
Add docs about end-to-end testing / GitLab QA tests

Closes #39637

See merge request gitlab-org/gitlab-ce!16043
2018-01-05 14:57:18 +00:00
Grzegorz Bizon 8bdc6c74e8 Rephrase paragraph about e2e tests in merge requests in docs 2018-01-05 15:32:41 +01:00
Jacob Vosmaer (GitLab) c5e2c0665f Allow local tests to use a modified Gitaly 2018-01-05 11:31:12 +00:00
Filipa Lacerda 41cc4cf502
Merge branch 'master' into 34312-eslint-vue-plugin
* master: (33 commits)
  Include integration tests in CE/EE testing documentation
  41054-Disallow creation of new Kubernetes integrations
  Resolve "Resizable file list and commit panel"
  Make tooltip placement bottom by default as per design guidelines
  Fix groups list icon, timestamp alignment and row height
  Avoid leaving a push event empty if payload cannot be created
  Use heredoc for long strings so it's easier to read
  Simplify metrics fetching for closed/merged MRs
  Better English
  Fix method lookup
  Use a background migration for issues.closed_at
  Handle Gitaly aborted merge due to branch update
  Fix API endpoints to edit wiki pages where project belongs to a group
  Fixes spec failures due to not returning metrics for MRs other than closed/merged
  Cache merged and closed events data in merge_request_metrics table
  Update test to remove carent icon check
  Update styles to fix SVG caret alignment
  Update selector to test SVG icon name
  Use SVG sprite icons
  Add support for max_count option to Git::Repository#count_commits
  ...
2018-01-04 15:53:16 +00:00
Grzegorz Bizon e8acb3f117 Copy-edit end-to-end testing guide documentation 2018-01-04 12:09:14 +01:00
Sean McGivern ac409fb444 Merge branch 'change-issues-closed-at-background-migration' into 'master'
Use a background migration for migrating issues.closed_at

See merge request gitlab-org/gitlab-ce!16083
2018-01-04 10:14:06 +00:00
Filipa Lacerda b299198e1e
Adds `eslint-plugin-vue`, fixes linter errors and adds docs 2018-01-03 23:14:55 +00:00
Yorick Peterse 78d22fb20d
Use a background migration for issues.closed_at
In a previous attempt (rolled back in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16021) we tried
to migrate `issues.closed_at` from timestamp to timestamptz using a
regular migration. This has a bad impact on GitLab.com and as such was
rolled back.

This commit re-implements the original migrations using generic
background migrations, allowing us to still migrate the data in a single
release but without a negative impact on availability.

To ensure the database schema is up to date the background migrations
are performed inline in development and test environments. We also make
sure to not migrate that that doesn't need migrating in the first place
or has already been migrated.
2018-01-03 12:28:00 +01:00
Onuwa Nnachi Isaac 3d5e4e34ca Fix typo in writing_documentation.md 2018-01-02 19:06:11 +01:00
Grzegorz Bizon 124ffb2134 Fix link to end-to-end testing docs from test pyramid 2018-01-02 14:42:28 +01:00
Grzegorz Bizon 1aa25a3fe3 Copy-edit end-to-end testing guidelines 2018-01-02 14:37:01 +01:00
Grzegorz Bizon 51bb5abe26 Link to end to end test guideline from test pyramid 2018-01-02 14:30:29 +01:00
Lin Jen-Shin a265ac25cb Add documents for GitLab utilities 2018-01-02 21:30:10 +08:00
Grzegorz Bizon 629d966c48 Extend documentation on end-to-end integration tests 2018-01-02 14:22:48 +01:00
Grzegorz Bizon 1f50eb4f57 Add docs about end-to-end testing / GitLab QA tests 2018-01-02 13:39:09 +01:00
Robert Speicher ea7f6fa80b Fix the header level for the Changelog Arguments documentation 2017-12-28 16:46:10 -06:00
Lin Jen-Shin 8139895b43 Use `Gitlab::Utils::Override` over defined?(super) 2017-12-26 17:18:10 +08:00
Sarah O'Donnell e18ea37dab Added 'admin' persona 2017-12-21 18:46:36 +00:00
Job van der Voort 007e51f128 organise content by subject 2017-12-21 13:31:41 +00:00
Filipa Lacerda 08949a1898 Update axios.md 2017-12-19 11:13:02 +00:00
Winnie Hellmann 4f73e14f2c Add createDateTimeFormat to format dates based on locale 2017-12-18 11:13:41 +01:00
Rémy Coutable 907af56a16 Merge branch 'patch-25' into 'master'
I'm currently the proofreader of Italians Translations, i've started to…

See merge request gitlab-org/gitlab-ce!15909
2017-12-18 08:45:17 +00:00