Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec/features/merge_request
AgeCommit message (Collapse)Author
2018-09-05Ensure the project has a repository in ↵Rémy Coutable
spec/features/merge_request/user_sees_breadcrumb_links_spec.rb This backport a fix that was made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7240 since the spec would fail there (and not in CE). Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-09-04Feature/new merge breadcrumbsJ.D. Bean
2018-09-01Merge branch 'assert-that-mr-diff-is-highlighted' into 'master'Grzegorz Bizon
Add spec to ensure MR diffs are highlighted Closes #50793 See merge request gitlab-org/gitlab-ce!21410
2018-08-30Reorganize issues and merge request feature specs in the same folderRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-08-29Add spec to ensure MR diffs are highlightedSean McGivern
2018-08-29Merge branch 'security-49085-persistent-xss-rendering' into 'master'José Iván Vargas López
[master] Fixed persistent XSS rendering/escaping of diff location lines See merge request gitlab/gitlabhq!2463
2018-08-21Escaped html charactersChantal Rollison
2018-08-08Fix broken spec checking for extinct elementAndré Luís
2018-08-07Squashed commit of the following:Shinya Maeda
commit 610c02c305d9fb3c7d271883450a5fee8b0cf16f Merge: f2088edb260 84f24dcef0d Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 23:01:38 2018 +0900 Merge branch 'master-ce' into improve-junit-support-be commit f2088edb26008e5791b7be86fc02fc470c881143 Merge: c67e1d32cac 339f47abec1 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 21:52:10 2018 +0900 Merge branch 'improve-junit-support-be' of gitlab.com:gitlab-org/gitlab-ce into improve-junit-support-be commit c67e1d32cac731b895e2f49a24ce0e1726b8196c Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 21:51:39 2018 +0900 Remove debuggable fixtures commit 339f47abec1d0ce815e6103a087902d71d8ff5be Merge: 7a33a9be724 96b748fbcc0 Author: Filipa Lacerda <filipa@gitlab.com> Date: Tue Aug 7 11:10:18 2018 +0100 Merge branch 'improve-junit-support-be' of https://gitlab.com/gitlab-org/gitlab-ce into improve-junit-support-be * 'improve-junit-support-be' of https://gitlab.com/gitlab-org/gitlab-ce: Add spec for latest Add spec for merge request Add spec for cache invalidation Add spec for pipeline Add spec Fix specs Support corrupted fixtures Add cache key to error message commit 7a33a9be724dbde79a24cec77658952ff2d2fa6c Author: Filipa Lacerda <filipa@gitlab.com> Date: Tue Aug 7 11:09:56 2018 +0100 Show resolved failures commit 96b748fbcc00a98a13aeb78f5d97de9cf25035b6 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 18:50:05 2018 +0900 Add spec for latest commit 0e8b024169b4b0ac272331117ac2fa821c4052f7 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 18:24:38 2018 +0900 Add spec for merge request commit 8690a699bc98394ad4deebdc91e6690758c5965e Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 18:18:55 2018 +0900 Add spec for cache invalidation commit 97678e1612826af409ca8a04b6c0dc830f7b66c6 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 18:01:03 2018 +0900 Add spec for pipeline commit 96c2a698af049e4026c68e74b1f41a265464b2b2 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 17:52:21 2018 +0900 Add spec commit 67bcbd25a3c13abb78ea43c0411f5aed417b87d0 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 17:39:02 2018 +0900 Fix specs commit d7d49def2023f85c07d2718b83f35c8849f65f05 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 13:11:07 2018 +0900 Support corrupted fixtures commit d58dbbc17a7d954db22082615f5331c148c1061b Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 13:10:47 2018 +0900 Add cache key to error message commit f6f976216dc36333b5e05e3f0acdfca689350483 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Aug 2 19:07:46 2018 +0900 bring back debaggable fixtures commit 48a7800e67a718145c0e88c324c0c1f9619e26a4 Merge: 2822b9e8a36 dd627072b3f Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 09:22:22 2018 +0900 Merge branch 'master-ce' into improve-junit-support-be commit 2822b9e8a369162d098a72a58803c8494b2343cd Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 22:54:47 2018 +0900 Move cache invalidation policy to outside of reactive cache commit b35efb1764ae61bb31dacbf79dbc022dcee3a203 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 22:34:10 2018 +0900 ADd reactive cache an ability to invalite cache commit feafee6f8a50f4a32866d8ae768e99766b0b7c73 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 19:25:22 2018 +0900 Pipeline has test reports if latest builds have any commit f302dbb73abe03c6c431e7d52d526e28a1586fee Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 19:18:56 2018 +0900 Invalidate test reports cache if it's outdated commit 83adaca01a1ee1cd64cac86b6fa3d10e2e4e2b98 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 18:08:06 2018 +0900 Revert cache invalidation in expire pipeline cache worker commit ec3af5de4ca34e2e92ad6b97f29733d6c65062bc Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 15:13:47 2018 +0900 Fix feature spec commit 0db48805a1ba68763be0504eb57218bde2380e4b Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 14:07:46 2018 +0900 Change lifetime of test reports cache to 10 minutes commit 17f7e78bfe2188c349cda1ff90a3ea94d337461e Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 14:07:19 2018 +0900 Add changelog commit 89c87585ab7f5333a8139c02b330dd2caf0be31a Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 14:01:20 2018 +0900 Add feature spec commit 1120cfd7a9ab06105f2e763c375fab00922b7e0c Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 12:55:47 2018 +0900 Invalidate cache when pipeline status transits. Correct test reports from the latest builds
2018-08-01Reapply "Merge branch '48817-fix-mr-changes-discussion-navigation' into ↵André Luís
'master'" This reverts commit e0fe97ca4a506405af8e85368f2c69cda637e192.
2018-08-01Revert "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"André Luís
This reverts commit ced005f330419ec81657e852c5cb9124fdb29fbb, reversing changes made to 9b01b293ce5ddbaeedaf014cdc804af2c5e86416.
2018-07-21Merge branch '_acet-fix-spec' into 'master'Tim Zallmann
Fix one disabled spec of comment posting. See merge request gitlab-org/gitlab-ce!20747
2018-07-20Resolve ""Jump to first/next unresolved discussion" jumps to resolved ↵André Luís
discussions"
2018-07-20Fix one disabled spec of comment posting.Fatih Acet
2018-07-17Merge cherry-pick modal specsGeorge Tsiolis
2018-07-17Add spec for closing cherry-pick modal on escape keypressGeorge Tsiolis
2018-07-11Resolve "Rename the `Master` role to `Maintainer`" BackendMark Chao
2018-07-09Updates from `rubocop -a`Lin Jen-Shin
2018-07-05Enable Capybara/FeatureMethods copWinnie Hellmann
2018-06-21Changes tab VUE refactoringFelipe Artur
2018-06-11Merge branch 'rs-update-rspec' into 'master'Rémy Coutable
Update rspec to 3.7 See merge request gitlab-org/gitlab-ce!19449
2018-06-07Merge branch '47182-use-the-default-strings-of-timeago-js' into 'master'Clement Ho
Use the default strings of timeago.js for timeago Closes #47182 See merge request gitlab-org/gitlab-ce!19350
2018-06-07Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan
Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
2018-06-07Make all uses of `fixture_file_upload` use relative pathsRobert Speicher
2018-06-05remove all .ico favicon variations, use png alwaysAlexis Reigel
the ci status icons are generated client side, wo we don't need the static files anymore.
2018-06-03Use the default strings of timeago.js for timeagoTakuya Noguchi
2018-06-01Rephrase "maintainer" to more precise "members who can merge to the target ↵Mark Chao
branch" "Maintainer" will be freed to be used for #42751
2018-05-25Fix indentation in user_selects_branches_for_new_mr_spec.rbWinnie Hellmann
2018-05-25Add failing test for https://gitlab.com/gitlab-org/gitlab-ce/issues/46627Winnie Hellmann
2018-05-24Merge branch 'mr-conflict-notification' into 'master'Douwe Maan
MR unmergeable notification See merge request gitlab-org/gitlab-ce!18042
2018-05-24Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master'Mike Greiling
Resolve "Escape key to close MR check out branch modal" Closes #45850 See merge request gitlab-org/gitlab-ce!19050
2018-05-22Closes MR check out branch modal with escapeJacopo
2018-05-21Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray
2018-05-17Add cannot_be_merged_recheck merge_statuslulalala
First, transitions between can_be_merged & cannot_be_merged are removed, as they are currently blocked in `check_if_can_be_merged`. `can_be_merge` always returns to `unchecked` first, before it can transition to `cannot_be_merged` (and vice versa). We want to avoid repeated notification triggered by repeated transition between `cannot_be_merged` & `unchecked`. So we added `cannot_be_merged_recheck` state, similar to `unchecked`, but as a mean to remember it’s from cannot_be_merged. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407 Since `unchecked` and `cannot_be_merged_recheck` both mean “we are in the middle of checking if it is mergeable”, quite often we need to see if merge_status is in either one of them, so `check_state?` is added to achieve this.
2018-05-03Load branches on new merge request page asynchronouslyWinnie Hellmann
2018-04-20Resolve "Text from the diff is showing within a table header inside the ↵Simon Knox
discussion after the discussion is resolved"
2018-04-17Merge branch '45271-collpased-diff-loading' into 'master'Phil Hughes
Resolve "Collapsed diff spacing wrong when failed to load" Closes #45271 and #45317 See merge request gitlab-org/gitlab-ce!18351
2018-04-13Fix rubocopFilipa Lacerda
2018-04-13Render only one error message per diffFilipa Lacerda
Move html to haml file instead of JS
2018-04-12 Fixes unresolved discussions rendering the error state instead of the diffFilipa Lacerda
2018-04-12Spec improvements for speed, reliability and readabilityBob Van Landuyt
2018-04-11Prevent awarding emoji when a project is archivedBob Van Landuyt
This prevents performing the requests, and disables all emoji reaction buttons
2018-04-11Prevent new merge requests for archived projectsBob Van Landuyt
This prevents creating merge requests targeting archived projects. This could happen when a project was already forked, but then the source was archived.
2018-04-04[ci skip] Merge branch 'master' into 42568-pipeline-empty-stateFilipa Lacerda
* master: (293 commits) Revert changelog entry for removed feature Revert "Allow CI/CD Jobs being grouped on version strings" Resolve "Protected branches count is wrong when a wildcard includes several protected branches" Use standard codequality job Resolve "Allow the configuration of a project's merge method via the API" [Rails5] Rename `sort` methods to `sort_by_attribute` Add better LDAP connection handling Updated components to PascalCase Handle invalid params when trying update_username Move network related app settings to expandable blocks [Rails5] Update Gemfile.rails5.lock [ci skip] Update Security Products examples documentation Backport Gitlab::Git::Checksum to CE Add changelog Refactor discussions/notes code Remove unnecessary section looking in admin settings qa Explicitly use page context for qa/factory/settings/hashed_storage.rb Use gitlab_environment because we need: Allow feature gate removal through the API Use shard name in Git::GitlabProjects instead of shard path ...
2018-04-03Properly set up jobs in mini pipeline graph specMatija Čupić
2018-04-03Replace the `project/issues/issues.feature` spinach test with an rspec analogblackst0ne
2018-03-14Merge branch 'mr-widget-deployment-styling' into 'master'Filipa Lacerda
Fix styling of multiple environments in merge request widget Closes #40610 See merge request gitlab-org/gitlab-ce!17663
2018-03-14fixed deployment rspecPhil Hughes
2018-03-13Resolve "Projects::MergeRequestsController#show is slow (implement skeleton ↵Simon Knox
loading)"
2018-03-12Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'Phil Hughes
Fix "Remove source branch" button in MR widget during MWPS state Closes #42814 and #4281 See merge request gitlab-org/gitlab-ce!17192
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-10 23:19:53 +0300