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/views/projects/merge_requests
AgeCommit message (Collapse)Author
2019-07-10Align items in merge request dashboardFilipa Lacerda
Vertically aligns ci icon, avatar, and comments icons in the merge request dashboard by using flex
2019-06-24Add identifiers for onboarding popoversMartin Wortschack
- Add button styles for onboarding welcome page - Fix qa selector (due to additional class)
2019-06-21Omit issues links in merge request entity API responseStan Hu
The merge request widget has a section that includes which issues may be closed or mentioned based on the merge request description. The problem is that rendering and redacting Markdown can be expensive, especially since the browser polls for the data every 10 seconds. Since these links don't change much and are just nice to have, we only load them on first page load. The frontend will use the existing data if the data doesn't appear on subsequent requests. This saves about 30% of the rendering time of this endpoint, which adds up to significant savings considering that `MergeRequestsController#show.json` is called over a million times a day on GitLab.com. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63546
2019-06-17Created a refreshed create merge request suiteTomislav Nikic
Created a refreshed test suite using api to improve speed. This was done by adding qa tags to the merge request view.
2019-06-14Added diff suggestion popoverPhil Hughes
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
2019-06-06Format vue files with prettierMarcel van Remmerden
Add changelog file
2019-06-06Merge request tabs fixesAnnabel Dunstone Gray
- Makes activity dropdown and resolved counter smaller - Uses grid for spacing - Removes scrolling on MR tabs
2019-04-25Externalize strings in merge request tabsVictor Wu
2019-04-23Move scoped_label into label presenterJan Provaznik
When rendering a label we want to check 'scoped_label' feature availability on a project/group where label is being used. For this reason a label presenter is used in UI and information about context project/group is passed to this presenter.
2019-04-12Fixed fluid layout preference not being respected in diffsPhil Hughes
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
2019-04-09[CE] Support multiple assignees for merge requestsOswaldo Ferreira
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
2019-04-02Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵John Jarvis
jarv/dev-to-gitlab-2019-04-02
2019-04-02Merge branch 'security-2819-xss-resolve-conflicts-branch-name' into 'master'GitLab Release Tools Bot
Fix XSS in resolve conflicts form See merge request gitlab/gitlabhq!2977
2019-03-26Add .code to all tables holding diffsDouwe Maan
We need this to be able to distinguish between Markdown tables and diff tables.
2019-03-26Remove .wiki and @md-typography mixin in favor of .md and .md-fileDouwe Maan
Before, the styling for `img:not(.emoji)`` was repeated between `.md:not(.use-csslab):not(.wiki)` (for comments and the Markdown preview), `.documentation.wiki` (for help pages), and `.issuable-details .description .wiki` (for MR and issue descriptions). In these places, we now simply use `.md`. Wherever we use `.md` but don't want this image styling (like wikis and blobs), `.md-file` is added.
2019-03-11Fix UI for closed MR when source project is removedTakuya Noguchi
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2019-03-08Disallow reopening of locked merge requestsJan Beckmann
Fixes #56864
2019-03-08Provide EE backports for filtering by approver featureIgor
Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files
2019-03-07Revert "Merge branch 'id-1951-filter-merge-requests-by-approvers' into 'master'"Igor
This reverts merge request !24982
2019-03-07Fix XSS in resolve conflicts formPaul Slaughter
The issue arose when the branch name contained Vue template JavaScript. The fix is to use `v-pre` which disables Vue compilation in a template.
2019-03-07Provide EE backports for filtering by approver featureIgor
Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files
2019-03-05Merge branch ↵Grzegorz Bizon
'45305-ci-status-icon-mismatch-on-merge-requests-page-and-the-mr-itself' into 'master' Resolve "CI status icon mismatch on Merge Requests page and the MR itself" Closes #45305 See merge request gitlab-org/gitlab-ce!25407
2019-02-26Removed other deprecated status helpersScott Hampton
Updating a couple other places that were still using deprecated status.
2019-02-21Sort labels alphabeticallyDmitriy Zaporozhets
Sorts labels alphabetically on issues (and merge requests) list. Before it was order id desc. Now it will be consistent with sidebar and labels page. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2019-02-19Fixing CI icon mismatchScott Hampton
MR list, and related MRs and branches were using a deprecated helper. Created a new icon haml file to help move these forward.
2019-02-05Merge branch 'diff-file-finder' into 'master'Filipa Lacerda
Added fuzzy file finder to merge requests Closes #53304 See merge request gitlab-org/gitlab-ce!24434
2019-02-05Added fuzzy file finder to merge requestsPhil Hughes
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
2019-02-04Remove Redcarpet markdown engineJan Provaznik
This engine was replaced with CommonMarker in 11.4, it was deprecated since then.
2019-02-04Merge branch ↵Sean McGivern
'19745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneously' into 'master' Forms with task lists can be overwritten when editing simultaneously See merge request gitlab-org/gitlab-ce!23938
2019-01-31[master] Pipelines section is available to unauthorized usersKamil Trzciński
2019-01-31Send lockVersion from MR description task listFatih Acet
2019-01-24CE port of "Display Merge Request approval counts in Merge Request list"Andy Steele
2018-12-20Code style changes and refactorHeinrich Lee Yu
2018-12-19Pass in just assignees instead of issuableHeinrich Lee Yu
2018-12-19Refactor sidebar to use data from serializerHeinrich Lee Yu
2018-12-19Refactor issuable sidebar to have extras optionHeinrich Lee Yu
2018-12-18Remove feature flag for suggest changes featureOswaldo Ferreira
2018-12-13Allow suggesting single line changes in diffsOswaldo Ferreira
2018-12-13Fix diff changes empty statePhil Hughes
The empty state now only gets shown when no files exist in the branch. If the user is reviewing 2 versions with no files, we don't show the state. Refactors the diff app spec to use Vue test utils. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48635
2018-11-27Update merge requests troubleshooting docs linkGrzegorz Bizon
2018-11-20Remove instances of `@extend .monospace`George Tsiolis
2018-11-09Update merge request page object and selectorsMark Lapierre
These are changes from EE that are also relevant to CE from: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8372
2018-11-05Merge branch 'qa-batch-comments-e2e-tests' into 'master'Nick Thomas
QA Selectors for Batch Comment E2E Automation See merge request gitlab-org/gitlab-ce!22681
2018-10-30QA Selectors for Batch Comment E2E Automationat.ramya
2018-10-24Fix the troubleshooting docs linkMatija Čupić
2018-10-24Add docs linkMatija Čupić
2018-10-23Resolve "Filter discussion (tab) by comments or activity in issues and merge ↵Oswaldo Ferreira
requests"
2018-10-06Backport CE changes for: [Frontend only] Batch comments on merge requestsAndré Luís
2018-10-01Merge branch ↵Bob Van Landuyt
'security-6881-project-group-approvers-leaks-private-group-info-ce' into 'master' [master] CE: Project group approvers leaks private group info See merge request gitlab/gitlabhq!2488
2018-09-26Resolve "Commit details are not displayed when reviewing an MR commit by commit"Paul Slaughter
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 04:09:30 +0300