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/app/helpers/merge_requests_helper.rb
AgeCommit message (Collapse)Author
2017-12-07adding view and feature specsmicael.bergeron
2017-12-07diff notes created in merge request on a commit have the right contextmicael.bergeron
add a spec for commit merge request diff notes
2017-10-07Allow creating merge requests across forks of a projectBob Van Landuyt
2017-08-01Rename many path_with_namespace -> full_pathGabriel Mazetto
2017-07-05Create and use project path helpers that only need a project, no namespaceDouwe Maan
2017-06-29Split up MergeRequestsControllerDouwe Maan
2017-05-10Enable the Style/TrailingCommaInLiteral copRémy Coutable
Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-09Merge request widget redesignFatih Acet
2017-04-27Fix 404 when upstream has disabled merge requestsmhasbini
2017-04-26Change issues sentence to use natural sortingJeff Stubler
2017-03-01Update occurrences of MWBS to MWPSJames Lopez
Rename column in the database Rename fields related to import/export feature Rename API endpoints Rename documentation links Rename the rest of occurrences in the code Replace the images that contain the words "build succeeds" and docs referencing to them Make sure pipeline is green and nothing is missing. updated doc images renamed only_allow_merge_if_build_succeeds in projects and fixed references more updates fix some spec failures fix rubocop offences fix v3 api spec fix MR specs fixed issues with partials fix MR spec fix alignment add missing v3 to v4 doc wip - refactor v3 endpoints fix specs fix a few typos fix project specs copy entities fully to V3 fix entity error more fixes fix failing specs fixed missing entities in V3 API remove comment updated code based on feedback typo fix spec
2017-02-14Don't ignore the parameter of MergeRequestsHelper#mr_change_branches_pathDongqing Hu
2017-02-08Merge branch 'restore-issues_mentioned_but_not_closing' into 'master'Sean McGivern
pass in current_user in MergeRequest and MergeRequestsHelper See merge request !8624
2017-02-07Fix MR widget urlJarka Kadlecova
2017-02-03Backport changes from EE squashSean McGivern
Backport changes from the EE-only squash implementation, which would otherwise conflict when merge CE into EE. <https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1024>
2017-01-19should pass in current_user from MergeRequestsHelperDongqing Hu
2017-01-13Address MR commentsJarka Kadlecova
2016-12-16better mentioned but not closing message and iconGabriel Gizotti
2016-12-16diplays mentioned but not merged message on MR show pageGabriel Gizotti
2016-10-20Fix the merge request view when source projects or branches are removedNick Thomas
2016-10-12Improve mr compare message when base is differentDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-06Added link to bulk assign issues to MR author. (Issue #18876)James
2016-09-07Improve merge request version featureDmitriy Zaporozhets
* Use version numbers instead of sha as more user-friendly * Make it clear that we compare later version (left) with older one (right) * Improve wording of version switch panel Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-07Expand abbreviations in merge request version path helperDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-07Compare merge request version against other version on changes pageDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-07Add link to compare merge request versionsDmitriy Zaporozhets
It adds a dropdown to the right of merge request version dropdown and allow you to choose older version for compare. Once clicked it will take user to compare page with older and newer versions sha pre-filled Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-30User can edit closed MR with deleted forkKatarzyna Kobierska
Add test for closed MR without fork Add view test visibility of Reopen and Close buttons Fix controller tests and validation method Fix missing space Remove unused variables from test closed_without_fork? method refactoring Add information about missing fork When closed MR without fork can't edit target branch Tests for closed MR edit view Fix indentation and rebase, refactoring
2016-07-11Merge branch 'mr-close-btn' into 'master' Robert Speicher
Correctly shows close button on merge requests Closes #19403 See merge request !5036
2016-07-11Moved merge request button visibility out of issue_helperPhil Hughes
2016-07-08Merge branch 'retrieve-mr-closes-issues-just-when-required' into 'master' Rémy Coutable
Avoid calculation of closes_issues. ## What does this MR do? Avoid unneeded calls to MR closes issues ## Are there points in the code the reviewer needs to double check? I'm not sure if calling this method from a view is a good practice, but I cannot see another simple way of avoiding this problem. In case we want to avoid this in the controller we need to specify the action, format and status of the merge request, because in that case we know that the `_open` partial will render. We could add some lazy evaluation but it not a thing I see in use along the app but feedback is welcome ## What are the relevant issue numbers? #14202 , #19490 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - ~~[ ] Added for this feature/bug~~ - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5140
2016-07-07Avoid calculation of closes_issues.Paco Guzman
We just need to get merge requests closes issues when we’re going to show them
2016-07-07Rename MergeRequest methods that return commits or shas to be more clear and ↵Douwe Maan
consistent
2015-12-22ci_build_details_path should return nil if builds_page result is nilKamil Trzcinski
This is required since we parse URI later and remove the credentials
2015-12-22removes api credentials from link to build_pageMarvin Frick
Also adds a spec for MergeRequestHelper to avoid having a regression later on.
2015-12-04Merge branch 'link-refs' into 'master' Robert Speicher
Recognize issue/MR/snippet/commit links as references. Fixes #3744 and #3745 See merge request !1933
2015-12-02Fix branch renderingDouwe Maan
2015-12-02Don't reset target branch when choosing to "Change branches" in MRDouwe Maan
2015-11-30Show local issues and MRs in "This X closes... / closed by..." sentenceDouwe Maan
2015-11-17Add "Start a new merge request" option to every commit formDouwe Maan
2015-10-20Add option to create merge request when editing/creating a fileDirceu Pereira Tiegs
2015-10-14Simplify the `issues_sentence` helperRobert Speicher
2015-10-01Include full path of source and target branch names in New Merge Request pageStan Hu
Previous title would only show the group name, which could be confusing. Closes #2875
2015-08-11Move command line insturction out of mr widgetDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets
This reverts commit 4773f38e28c91dbbb6e5e385e0c403877298bfed, reversing changes made to 0d5d80b735eb18ae79eb2bfe26c08896d53db414.
2015-08-07Move command line insturction out of mr widgetDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-06When use change branches link at MR form - save source branch selection ↵Dmitriy Zaporozhets
instead of target one Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-03-25Style/RedundantReturn enabledDmitriy Zaporozhets
2015-03-20Link to CI with refValery Sizov
2015-02-14Upgrade to Rails 4.1.9Vinnie Okada
Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
2015-02-03Fix syntax errorDmitriy Zaporozhets
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-17 05:07:51 +0300