Commit Graph

38 Commits

Author SHA1 Message Date
GitLab Bot 6e3df404ce Add latest changes from gitlab-org/gitlab@master 2023-03-22 00:16:43 +00:00
GitLab Bot a3c63916d3 Add latest changes from gitlab-org/gitlab@master 2023-01-12 06:07:24 +00:00
GitLab Bot 130b909c4f Add latest changes from gitlab-org/gitlab@master 2022-12-05 06:07:17 +00:00
GitLab Bot b0e1e54ce9 Add latest changes from gitlab-org/gitlab@master 2022-08-20 00:12:08 +00:00
GitLab Bot acda833a93 Add latest changes from gitlab-org/gitlab@master 2022-08-05 06:11:46 +00:00
GitLab Bot 4905885126 Add latest changes from gitlab-org/gitlab@master 2021-08-03 18:10:02 +00:00
GitLab Bot ec8587780b Add latest changes from gitlab-org/gitlab@master 2021-06-23 00:07:53 +00:00
GitLab Bot 8b0ef13236 Add latest changes from gitlab-org/gitlab@master 2020-06-03 18:08:28 +00:00
GitLab Bot 66ce6a78f6 Add latest changes from gitlab-org/gitlab@master 2020-01-22 00:08:47 +00:00
GitLab Bot c158fa8d69 Add latest changes from gitlab-org/gitlab@master 2020-01-16 12:08:32 +00:00
Denys Mishunov 371e1ed371 Always pre-select "Start a new merge request"
One exception: there is an existing MR for the current branch and the
branch is non-default and non-protected.

Extended mock_data for ide/stores to have different types of branches:
default, protected and regular

Cleaned new MR checkbox view
2019-08-22 23:23:06 +00:00
Thong Kuah 73e848850c Add frozen_string_literal to spec/features
Using the sed script from
https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-07-26 13:23:30 +12:00
Nick Thomas a600f147b4
Add Aria support to capybara 2019-07-22 14:28:31 +01:00
Phil Hughes b328218a71
Updated specs to account for removed buttons 2018-09-21 06:51:23 +01:00
Paul Slaughter 0d6e50d542 Create Web IDE MR and branch picker 2018-08-07 15:15:56 +00:00
Filipa Lacerda d2c5ac61cd Merge branch 'ide-row-dropdown-design-update' into 'master'
Improvements to new entry dropdowns in Web IDE

Closes #44845

See merge request gitlab-org/gitlab-ce!20526
2018-07-12 08:42:27 +00:00
Phil Hughes be74e3936d
Improvements to new entry dropdowns in Web IDE
Closes #44845
2018-07-11 16:47:13 +01:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00
Winnie Hellmann 3db2f32759 Enable Capybara/FeatureMethods cop 2018-07-05 06:32:05 +00:00
Phil Hughes 382546e054
fixed feature specs 2018-05-01 12:02:22 +01:00
Phil Hughes b2a17468c1
spec fixes 2018-04-30 09:55:57 +01:00
Phil Hughes f43b7af706
Merge branch 'master' into ide-workbench-bar 2018-04-19 12:45:53 +01:00
Phil Hughes 201afb0f85
improvements to the design 2018-04-18 14:36:32 +01:00
Phil Hughes 51c64f3fc7
Added staged files state to IDE
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/4541
2018-03-22 10:33:19 +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
Jose Ivan Vargas 407d563844 Fix up Web IDE user preference copy and buttons 2018-01-11 08:23:44 +00:00
Tim Zallmann 213e91d439 Resolve "Decouple multi-file editor from file list" 2017-12-21 15:05:47 +00:00
Winnie Hellmann bf22eb6123 Rename popup-dialog to modal 2017-12-12 13:07:03 +01:00
Phil Hughes e9c7015203
fixed rspec
added getter specs
2017-11-24 15:55:08 +00:00
Mike Greiling 61865cfc93
add CookieHelper and InputHelper automatically to :js tests 2017-11-02 10:26:27 -05:00
Mike Greiling 1cf167fc3e
Merge branch 'master' into sh-headless-chrome-support
* master: (84 commits)
  Migrate Gitlab::Git::Wiki#page to Gitaly
  Load participants async
  Normalize LDAP DN when looking up identity
  Improve the maintenance policy page
  add changelog
  fix spec failure
  Allow promoting project milestones to group milestones
  fix specs
  Be able to bundle gems with newer rubies
  Upgrade Ruby to 2.3.5
  fixed up upload feature after master merge
  fix missing issue assignees
  Migrate Gitlab::Git::Wiki#delete_page to Gitaly
  Enable eslint
  Make `#hashed_storage?` require feature argument
  Adds callback function to inital cluster request
  Fix example typo.
  Upload files through the multi-file editor
  get branch name from the DOM
  Resolve "Convert autosize.js library to be a Yarn managed library"
  ...
2017-10-31 16:08:11 -05:00
Phil Hughes 662f87ca37
spec fixes 2017-10-31 09:06:23 +00:00
Mike Greiling d5bee2c6e0
fix set_cookie references within multi-file editor specs 2017-10-30 16:26:01 -05:00
Mike Greiling 945a262dfa
flash message broken in rspec but already covered by repo_service_spec.js 2017-10-30 16:24:44 -05:00
Phil Hughes 098a98055a
spec fixes
increased perf of scrolling tabs into view
2017-10-30 16:25:32 +00:00
Phil Hughes 5c75d750cf
addressed feedback from review
spec fixes
2017-10-30 14:36:24 +00:00
Phil Hughes 4699cf77b6
added feature spec 2017-10-23 10:47:22 +01:00