Commit Graph

20 Commits

Author SHA1 Message Date
Phil Hughes f4a15ac0a3
fixed failing IDE test 2018-01-30 09:12:58 +00:00
Phil Hughes 9af1773f8d
Converted API.js to axios 2018-01-30 09:12:56 +00:00
Tim Zallmann 4167f19b0a Upgraded all vue libraries 2018-01-23 09:37:07 +00:00
Tim Zallmann e79db43d2c WebIDE: Fix Commit bugs 2018-01-19 09:38:34 +00:00
Filipa Lacerda 1245d35f14 Merge branch 'main-js-tidy-up' into 'master'
Tidy up main JS file

See merge request gitlab-org/gitlab-ce!16007
2018-01-11 18:40:22 +00:00
Phil Hughes ff0f74ac6e
Tidy up main JS file 2018-01-10 11:07:42 +00:00
Filipa Lacerda 349d06688f
Fix more eslint rules 2018-01-08 20:01:49 +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
Filipa Lacerda 7ca5a3f99d
Fixes more eslint rules 2018-01-06 19:54:45 +00:00
Filipa Lacerda cbdbb64523
[ci skip] Fix more eslint rules 2018-01-06 19:03:01 +00:00
Filipa Lacerda e9c6f58e7e
[ci skip] Fix conflicts 2018-01-05 18:26:39 +00: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
Tim Zallmann 91477f6dae Resolve "Helpful and instructing Empty state for multi file editor" 2018-01-05 17:35:34 +00:00
Filipa Lacerda 088de7237a
[ci skip] Fix more eslint rules 2018-01-05 15:45:05 +00:00
Winnie Hellmann 2c47f0924f Add id to modal.vue to support data-toggle="modal" 2018-01-05 12:47:38 +01: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
Tim Zallmann 7fbb5addaf Resolve "Resizable file list and commit panel" 2018-01-04 09:31:06 +00:00
Filipa Lacerda b299198e1e
Adds `eslint-plugin-vue`, fixes linter errors and adds docs 2018-01-03 23:14:55 +00:00
Tim Zallmann 3a727aa6d4 Multi File Editor File icons 2018-01-03 10:08:14 +00:00
Tim Zallmann 213e91d439 Resolve "Decouple multi-file editor from file list" 2017-12-21 15:05:47 +00:00