summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests
Commit message (Collapse)AuthorAgeFilesLines
* Improve MR feature specs and reduce duplicationrc/improve-mr-feature-specsRémy Coutable2018-01-1847-5267/+278
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-2225-34/+34
|
* Merge branch '40063-markdown-editor-improvements' into 'master'Filipa Lacerda2017-12-211-0/+15
|\ | | | | | | | | | | | | Hide toolbar in markdown preview mode Closes #40063 See merge request gitlab-org/gitlab-ce!15994
| * Add spec for previewing a note40063-markdown-editor-improvementsAnnabel Dunstone Gray2017-12-201-0/+15
| |
* | Stub old image diff urlClement Ho2017-12-201-1/+2
| |
* | Fix a failure because we stub DiffHelper#diff_file_blob_raw_path instead of ↵41291-spec-failure-on-spec-features-merge_requests-image_diff_notes_spec-rbRémy Coutable2017-12-201-2/+2
| | | | | | | | | | | | #diff_file_blob_raw_url Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Fix onion-skin re-entering stateClement Ho2017-12-191-13/+29
|/
* Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'Sean McGivern2017-12-181-4/+4
|\ | | | | | | | | Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests See merge request gitlab-org/gitlab-ce!15847
| * Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributesOswaldo Ferreira2017-12-151-4/+4
| | | | | | | | requests
* | Fix image view modeClement Ho2017-12-111-0/+12
|/
* Merge branch 'acet-fix-branches-list-on-cherry-pick-modal-after-merge' into ↵Jacob Schatz2017-12-071-0/+12
|\ | | | | | | | | | | | | | | | | 'master' Fix loading branches list on cherry pick modal after merge. Closes #33894 See merge request gitlab-org/gitlab-ce!15306
| * Fix loading branches list on cherry pick modal after merge.acet-fix-branches-list-on-cherry-pick-modal-after-mergeFatih Acet2017-12-041-0/+12
| |
* | adding view and feature specsmicael.bergeron2017-12-071-42/+63
| |
* | Ensure pippeline corresponds with the sha of an MRJarka Kadlecova2017-12-051-1/+14
| |
* | Rename artifacts_* to legacy_artifacts_*Kamil Trzcinski2017-12-031-2/+2
|/
* Merge branch '39564-clear-filter-on-gitlab-dropdown-open' into 'master'Tim Zallmann2017-11-121-0/+22
|\ | | | | | | | | | | | | Clear filter on gl_dropdown open Closes #39564 See merge request gitlab-org/gitlab-ce!15214
| * add feature spec to assert no linked filter inputsLuke "Jared" Bennett2017-11-061-0/+22
| |
* | Move clear search test to JS to reduce overkillmove-filter-mr-clear-search-spec-to-jsEric Eastwood2017-11-091-16/+0
|/ | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/33661
* replace use of unsupported trigger method with clickMike Greiling2017-11-031-1/+1
|
* Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-021-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (109 commits) Remove Filesystem check metrics that use too much CPU to handle requests Set merge_request_diff_id on MR when creating Add a column linking an MR to its diff Remove useless closeReopenReport specs Clarify external artifacts only working when GitLab pages is enabled Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in Remove an exception from the git user default SSH config check Geo route whitelisting is too optimistic Update .nvmrc to current stable (v9.0.0) Update documentation Address Douwe's feedback Refactor responsive table styles to support nested error block Add changelog items Update specs for sudo behavior Move RSS and incoming email tokens from User Settings > Accounts to User Settings > Access Tokens Remove user authentication_token column Migrate user private tokens to personal access tokens Add sudo API scope Consistently use PersonalAccessToken instead of PersonalToken Remove User#private_token ...
| * Lets try with trigger('click')Tim Zallmann2017-10-301-1/+1
| |
* | explicitly add Accept: */* HTTP header back to testMike Greiling2017-11-021-1/+3
| |
* | add CookieHelper and InputHelper automatically to :js testsMike Greiling2017-11-022-2/+0
| |
* | prevent resolve buttons from being clicked twice triggering a race conditionMike Greiling2017-11-011-4/+2
| |
* | add accept_confirm when attempting to stop an environment in ↵Mike Greiling2017-10-301-1/+1
| | | | | | | | widget_deployments_spec.rb
* | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-291-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (96 commits) Fetch the merged branches at once Merging EE doc into CE Avoid using Rugged in Gitlab::Git::Wiki#preview_slug Cache commits on the repository model Remove groups_select from global namespace & simplifies the code Change default disabled merge request widget message to "Merge is not allowed yet" Semi-linear history merge is now available in CE. Remove repetitive karma spec Improve spec to check hidden component Rename to shouldShowUsername Add KubernetesService#default_namespace tests Revert "Merge branch '36670-remove-edit-form' into 'master'" Fix bitbucket login Remove duped tests Add path attribute to WikiFile class Make local_branches OPT_OUT Clarify the language around External Group membership with SAML SSO to clarify that this will NOT add users to GitLab Groups. Added ssh fingerprint, gitlab ci and pages information in an instance configuration page Fix the incorrect value being used to set GL_USERNAME on hooks Resolve "Remove overzealous tooltips in projects page tabs" ...
| * Merge branch 'master' into 37860-pipelines-pageFilipa Lacerda2017-10-233-0/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (88 commits) Fix deletion of container registry or images returning an error The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix: Decrease ABC threshold to 54.28 Update VERSION to 10.2.0-pre Update CHANGELOG.md for 10.1.0 Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` Fix the external URLs generated for online view of HTML artifacts Use title as placeholder instead of issue title for reusability Fix failure in current_settings_spec.rb Clarify the difference between project_update and project_rename URI decode Page-Title header to preserve UTF-8 characters Update Gitaly version to v0.49.0 Decrease Perceived Complexity threshold to 14 Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)" Force non diff resolved discussion to display when collapse toggled Added submodule support in multi-file editor add note about after_script being run separately Check for element before evaluate_script Merge branch 'master-i18n' into 'master' Update Prometheus gem to fix problems with other files overwriting current file ...
| * | Fix failing testsFilipa Lacerda2017-10-191-1/+0
| | |
* | | remove unneeded accept headerMike Greiling2017-10-241-4/+0
| | |
* | | fix body scrollTop referencesMike Greiling2017-10-241-2/+2
| | |
* | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-234-5/+30
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (297 commits) Fix deletion of container registry or images returning an error The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix: Decrease ABC threshold to 54.28 Update VERSION to 10.2.0-pre Update CHANGELOG.md for 10.1.0 Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` Fix the external URLs generated for online view of HTML artifacts Use title as placeholder instead of issue title for reusability Fix failure in current_settings_spec.rb Clarify the difference between project_update and project_rename URI decode Page-Title header to preserve UTF-8 characters Update Gitaly version to v0.49.0 Decrease Perceived Complexity threshold to 14 Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)" Force non diff resolved discussion to display when collapse toggled Added submodule support in multi-file editor add note about after_script being run separately Check for element before evaluate_script Merge branch 'master-i18n' into 'master' Update Prometheus gem to fix problems with other files overwriting current file ...
| * | Merge branch 'feature/reliable-rspec-with-eval-script' into 'master'Rémy Coutable2017-10-203-0/+6
| |\ \ | | |/ | |/| | | | | | | Check for element before execute_script See merge request gitlab-org/gitlab-ce!14898
| | * Check for element before evaluate_scriptEric Eastwood2017-10-193-0/+6
| | | | | | | | | | | | | | | Tip from https://robots.thoughtbot.com/write-reliable-asynchronous-integration-tests-with-capybara#directly-interacting-with-javascript
| * | Fix resolved discussions not expanding on side by side viewClement Ho2017-10-181-5/+24
| |/
* | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-122-11/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (104 commits) Update licenses fix a wrong method call in the refactor fix a whitespace fix for discussion Update templates via: Update doc accordingly to: Cache issuable template names Fix the format of rugged alternate directory list Match full file path in FileDetector Fixes from CSS refactor Resolve "Prometheus service page shows error" Explicit state integration deletion Move all API authentication code to APIGuard Shorten example translation for inclusive language [ci-skip] add changelog fix the merger override to remove source branch add spec Removed d3.js from the users and graphs bundle Cleanup data-page attribute after each Karma test Update template description wording ...
| * Add explicit test to test resolved discussion toggle contentadd-resolve-discussion-testClement Ho2017-10-101-5/+15
| |
| * Fix unable to expand text diff discussion commentsClement Ho2017-10-101-6/+2
| |
* | ensure delete option is visible before attempting to click on itMike Greiling2017-10-121-1/+4
| |
* | fix element click methodsMike Greiling2017-10-121-2/+2
| |
* | fix diff_notes_avatars_spec.rb failures in headless ChromeMike Greiling2017-10-091-1/+1
| |
* | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-0931-61/+354
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (113 commits) Introduce new hook data builders for Issue and MergeRequest Don't create todos for old issue assignees Start adding Gitlab::HookData::IssuableBuilder Include the changes in issuable webhook payloads Rename the `codeclimate` job to `codequality` Don't show an "Unsubscribe" link in snippet comment notifications Add QA::Scenario::Gitlab::Group::Create Removes CommitsList from global namespace Fix wiki empty page translation namespace not being removed Fixes mini graph in commit view Fix link to new i18n index page Update i18n docs Move i18n/introduction to i18n/index Resolve "Simple documentation update - backup to restore in restore section" Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespace Move cycle analytics banner into a vue file Updated Icons + Fix for Collapsed Groups Angle Don't create fork networks for root projects that are deleted Remove executable permissions on images to make docs lint happy Sync up hard coded DN class in migration ...
| * Replaces `tag: true` into `:tag` in the specsJacopo2017-10-0728-45/+45
| | | | | | | | | | | | Replaces all the explicit include metadata syntax in the specs (tag: true) into the implicit one (:tag). Added a cop to prevent future errors and handle autocorrection.
| * Add a project forks spec helperBob Van Landuyt2017-10-074-19/+32
| | | | | | | | | | The helper creates a fork of a project with all provided attributes, but skipping the creation of the repository on disk.
| * Find branches in all projects in the fork networkBob Van Landuyt2017-10-071-0/+19
| |
| * Allow creating merge requests across forks of a projectBob Van Landuyt2017-10-071-0/+60
| |
| * Commenting on image diffsFelipe Artur2017-10-073-2/+203
| |
* | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-10-063-31/+68
|\ \ | |/
| * Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-061-0/+49
| |\ | | | | | | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531
| | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Jarka Kadlecova2017-10-031-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 # Conflicts: # db/schema.rb
| | * | fix code styleJarka Kadlecova2017-09-271-2/+2
| | | |
View Lorry Controller Status