Commit Graph

57 Commits

Author SHA1 Message Date
Clement Ho 9bcf8f43c6 [skip ci] Replace hidden-xs 2018-04-09 16:50:40 -05:00
Clement Ho 35991d1662 [skip ci] Replace hidden-sm 2018-04-09 16:36:25 -05:00
Clement Ho b413785e1d [skip ci] Replace .pull-right with .float-right 2018-04-09 12:42:45 -05:00
Clement Ho 3e7a17d475 Replace .pull-left with .float-left 2018-04-09 12:36:21 -05:00
Clement Ho aa4942a213 Merge branch 'master' into 'bootstrap4'
# Conflicts:
#   app/helpers/issuables_helper.rb
#   app/views/projects/_home_panel.html.haml
#   app/views/projects/commits/_commit.html.haml
2018-04-09 17:04:05 +00:00
Clement Ho 917b7e0dd9 Rename .btn-default to .btn-secondary 2018-04-09 11:49:18 -05:00
Clement Ho 63c9b63a3f Rename col-xs-* to col-* 2018-04-09 11:45:38 -05:00
Tim Zallmann b2daa846a1 Web IDE blob image + default fallback 2018-04-06 17:49:06 +00:00
Filipa Lacerda 0c60e781c0 Merge branch 'ide-diff-inline' into 'master'
Change IDE diff view responsively

Closes #44305

See merge request gitlab-org/gitlab-ce!18049
2018-04-05 15:23:00 +00:00
Tim Zallmann c88cc0c0ec Web IDE markdown preview 2018-04-05 11:12:40 +00:00
Filipa Lacerda 942488b8c4 Merge branch 'ide-sidebar-min-width' into 'master'
Changed IDE sidebar min width

Closes #44836

See merge request gitlab-org/gitlab-ce!18123
2018-04-05 09:31:22 +00:00
Phil Hughes 9cd0bb74aa
Change IDE diff view responsively
Closes #44305
2018-04-05 10:19:14 +01:00
Phil Hughes 259adc3415
Updated components to PascalCase
Added comment for `key` usage
2018-04-04 09:20:55 +01:00
Phil Hughes c0dddb511c
Merge branch 'master' into ide-pending-tab 2018-04-03 10:59:29 +01:00
Phil Hughes fc15ebaa15
CHanged IDE sidebar min width
Changes the IDE sidebar min width to be 340px to make it more usable
after resizing.

Closes #44836
2018-04-01 16:37:28 +01:00
Tim Zallmann 9d958af5a2 Fixed Utility Function based on Review Comments 2018-03-28 15:35:28 +02:00
Phil Hughes 029f7e6cd8
removed file changes that have no changes to make diff easier
simplified SET_FILE_ACTIVE openFiles map
use .find in router so that it returns early instead of looping all the
values
2018-03-28 14:08:38 +01:00
Phil Hughes 8c4ad7385d
stops opening a pending tab if current tab is in review mode already 2018-03-28 14:08:34 +01:00
Phil Hughes a515b45929
remove extra state property
pending tabs now get added into openfiles & just filtered correctly
2018-03-28 14:08:32 +01:00
Phil Hughes 89bb7b85ec
fixed eslint inconsistent return 2018-03-28 14:08:32 +01:00
Phil Hughes bead083c58
updated specs 2018-03-28 14:08:32 +01:00
Phil Hughes bfdeee1de9
correctly toggle between tabs 2018-03-28 14:08:31 +01:00
Phil Hughes c5c7baec60
opens the next open tab correctly
fixes model being cached as undefined
fixed open files not being correctly mutated
2018-03-28 14:08:31 +01:00
Phil Hughes c439548830
fix closing & reopening pending tabs 2018-03-28 14:08:29 +01:00
Phil Hughes e2f273935e
toggling viewer mode closes the pending tab
then opens the file in edit mode
2018-03-28 14:08:29 +01:00
Phil Hughes 002cc92389
Added pending tabs to IDE
Pending tabs are normal tabs that are opened from the right sidebar.
They are opened in diff mode and when changed to edit mode they get
closed
& the actual file gets opened.
2018-03-28 14:08:28 +01:00
Tim Zallmann 4b4439e6fb Fixes for ESLint Errors 2018-03-28 12:17:30 +02:00
Tim Zallmann 9961498eb6 Fixed Path to tooltip directive 2018-03-28 12:17:30 +02:00
Tim Zallmann 4afd72377d Added Changes based on UX Review 2018-03-28 12:17:30 +02:00
Tim Zallmann 0ea359d2cf Fixes to Formatting to all Files 2018-03-28 12:17:02 +02:00
Tim Zallmann f00a971a6d ESLint + Karma fixes 2018-03-28 12:17:02 +02:00
Tim Zallmann fa3b02413b Fixed new Additions
Automatic Diff Navigation
2018-03-28 12:17:02 +02:00
Tim Zallmann b452bdead4 Actual MR diff displayed 2018-03-28 12:17:02 +02:00
Tim Zallmann f62359c23b Basic Setup for MR Showing 2018-03-28 12:17:02 +02:00
Winnie Hellmann 07487628f4 Rename modal.vue to deprecated_modal.vue 2018-03-22 10:48:17 +01:00
Tim Zallmann 6f71ed6082 Merge branch 'ide-folder-button-path' into 'master'
Fixes the web IDE link in tree list opening the wrong URL

Closes #44477

See merge request gitlab-org/gitlab-ce!17900
2018-03-21 16:25:42 +00:00
Phil Hughes 724cca8d76
Fixes the web IDE link in tree list opening the wrong URL
Closes #44477
2018-03-21 12:06:44 +00:00
Phil Hughes 6202657ec7
Changes empty project avatar to identicon in the IDE
Closes #44298
2018-03-21 11:27:43 +00:00
Phil Hughes f527e6e185
Move IDE to CE
This also makes the IDE generally available
2018-03-20 14:12:48 +00:00
Phil Hughes 4927cb75e6
Remove IDE from CE 2018-03-02 08:42:02 +00:00
Rémy Coutable 4f83906793
Move the remaining EE-specific JS files to ee/
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-28 12:05:25 +01:00
Rémy Coutable d434c62a83 Move EE-specific JavaScript files to ee/app/assets/javascripts 2018-02-26 19:43:34 +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 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 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