Commit Graph

95 Commits

Author SHA1 Message Date
Phil Hughes f0ffc19ee7
Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-commit-box 2018-05-04 14:01:16 +01:00
Phil Hughes 805302c0c0
fixed duplicated tests 2018-05-04 13:59:02 +01:00
Phil Hughes 80617b9039
Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-commit-box 2018-05-04 13:40:41 +01:00
Phil Hughes d9f3af500c
Merge branch 'master' into 44846-improve-web-ide-left-panel-and-modes 2018-05-04 13:36:50 +01:00
Filipa Lacerda bb3beb5e9e Merge branch 'ide-tree-changes-count' into 'master'
Added changes count to web IDE folder

See merge request gitlab-org/gitlab-ce!18452
2018-05-03 17:33:33 +00:00
Phil Hughes 93f0eb07c9
Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-commit-box 2018-05-03 12:39:22 +01:00
Phil Hughes 9b8332d324
Merge branch 'master' into 44846-improve-web-ide-left-panel-and-modes 2018-05-03 10:17:05 +01:00
Phil Hughes 0917b1d81b
Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-commit-box 2018-05-03 09:44:08 +01:00
André Luís 7a8af42923 Improve Web IDE Commit Panel 2018-05-03 08:30:44 +00:00
Phil Hughes 8c9fad9d32
fixed repo_editor_spec 2018-05-02 16:22:13 +01:00
Phil Hughes 4f2f02bfe8
fixed specs 2018-05-02 12:59:14 +01:00
Phil Hughes cf2def4275
fixed spec 2018-05-01 15:56:55 +01:00
Phil Hughes 2dc3d43c64
changed which element is hidden 2018-05-01 14:42:55 +01:00
Phil Hughes d995eb280b
spec fixes
added spec to check for last opened file
2018-05-01 12:57:26 +01:00
Phil Hughes cac07a46e0
fixed file spec 2018-05-01 11:00:23 +01:00
Phil Hughes bec24d1581
use getters to correctly get the counts for both unstaged & staged changes 2018-05-01 09:29:08 +01:00
Phil Hughes 9f8895316e
fixed karma & eslint 2018-04-30 09:43:23 +01:00
Phil Hughes fd43419ace
Merge branch 'master' into ide-tree-changes-count 2018-04-30 09:24:22 +01:00
Phil Hughes cb4a91e267
Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-activity-bar-review-mode 2018-04-27 17:58:18 +01:00
Phil Hughes f489fa2ac1
fixed karma specs 2018-04-27 17:55:39 +01:00
Phil Hughes eeb41af728
specs 2018-04-27 14:42:57 +01:00
Phil Hughes 6a651eb721
Merge branch 'master' into 44846-improve-web-ide-left-panel-and-modes 2018-04-27 10:19:40 +01:00
Phil Hughes f1b206a56b
fixed eslint 2018-04-26 19:52:59 +01:00
Phil Hughes 7311e69f5f
added aria-label to buttons
updated variable name
removed un-used prop
2018-04-26 14:06:35 +01:00
Phil Hughes ea680b73de
specs 2018-04-26 12:02:26 +01:00
Phil Hughes c83ed559e1
Merge branch 'ide-workbench-bar' into ide-activity-bar-review-mode 2018-04-26 10:13:10 +01:00
Phil Hughes 1724594af9
Merge branch 'master' into ide-tree-changes-count 2018-04-25 12:44:47 +01:00
Phil Hughes 9990afb92c
Merge branch 'master' into ide-temp-file-folder-fixes 2018-04-25 10:51:41 +01:00
Phil Hughes 7adbed7464
Merge branch 'master' into ide-workbench-bar 2018-04-25 10:38:06 +01:00
Phil Hughes cfae2d755c
fixed scss lint & ide_tree_spec 2018-04-23 10:51:44 +01:00
Phil Hughes c645f4edbe
fixed spec 2018-04-23 10:36:46 +01:00
Phil Hughes fc11520e51
fixed repo_tabs_spec
fixed editor_spec
2018-04-23 08:55:59 +01:00
Phil Hughes e40995625d
Merge branch 'master' into ide-tree-changes-count 2018-04-23 08:55:27 +01:00
Phil Hughes bdc84d4f4a
Merge branch 'master' into ide-file-finder 2018-04-23 08:54:30 +01:00
Phil Hughes e1a701c79a
Merge branch 'master' into ide-temp-file-folder-fixes 2018-04-23 08:54:02 +01:00
Phil Hughes 2c9efd8230
Merge branch 'master' into ide-workbench-bar 2018-04-20 14:36:07 +01:00
Phil Hughes 86fa04692c
fixed repo_tabs_spec 2018-04-20 14:35:46 +01:00
Phil Hughes efdd9e1ad4
added component spec 2018-04-20 12:20:00 +01:00
Phil Hughes 5ac76edb98
moved activity bar view constant into constants file 2018-04-20 09:48:29 +01:00
Phil Hughes 913c607030
added spec to ide_side_bar 2018-04-19 16:54:54 +01:00
Phil Hughes 949160e382
removed collapsed & toggle collapsed specs 2018-04-19 14:45:50 +01:00
Phil Hughes 5d1d5830ac
Merge branch 'master' into ide-temp-file-folder-fixes 2018-04-19 14:13:16 +01:00
Phil Hughes d14a06da4e
spec updates 2018-04-19 13:51:20 +01:00
Phil Hughes 79b498169e
Merge branch 'master' into ide-file-finder 2018-04-19 13:01:02 +01:00
Tim Zallmann 674702e02e Merge branch 'ide-diff-marker-cache-fix' into 'master'
Fixed IDE diff markers being cached too long

See merge request gitlab-org/gitlab-ce!18311
2018-04-19 11:47:20 +00:00
Phil Hughes f43b7af706
Merge branch 'master' into ide-workbench-bar 2018-04-19 12:45:53 +01:00
Phil Hughes aadde87f42
moved keycodes constants to common lib file
updated markup to use buttons instead of links
2018-04-19 12:04:49 +01:00
Phil Hughes 356a37cf50
added spec to new file dropdown 2018-04-19 09:01:27 +01:00
Phil Hughes 5eb7ed7509
fixed prop name in specs 2018-04-18 15:34:32 +01:00
Phil Hughes 1e3a3618be
fixed ide_spec.js 2018-04-18 14:59:24 +01:00