summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42GitLab Bot2020-10-211-0/+1
* Add latest changes from gitlab-org/gitlab@13-4-stable-eeGitLab Bot2020-09-191-1/+1
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-07-201-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-132-2/+2
* Format vue files with prettierMarcel van Remmerden2019-06-061-1/+1
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jarv/dev-to-gitl...jarv/dev-to-gitlab-2019-04-02John Jarvis2019-04-021-1/+1
|\
| * Fix XSS in resolve conflicts formPaul Slaughter2019-03-071-1/+1
* | Add .code to all tables holding diffsDouwe Maan2019-03-262-3/+3
|/
* Code style changes and refactorHeinrich Lee Yu2018-12-201-4/+0
* Pass in just assignees instead of issuableHeinrich Lee Yu2018-12-191-0/+4
* Refactor sidebar to use data from serializerHeinrich Lee Yu2018-12-191-1/+1
* Replace label-light with label-bold. Because it's bold, not lightAnnabel Dunstone Gray2018-07-191-1/+1
* Fix alignment of MR conflict resolutionAnnabel Dunstone Gray2018-05-231-1/+1
* Merge branch 'master' into bootstrap4Clement Ho2018-05-222-6/+14
|\
| * Fix sentence for i18n44895-explicit-merge-conflictAnnabel Dunstone Gray2018-05-211-6/+4
| * Add internationlization for conflict descriptionAnnabel Dunstone Gray2018-05-211-4/+4
| * Update copy; add monospace font to branch namesAnnabel Dunstone Gray2018-05-212-5/+5
| * Make source branch a linkAnnabel Dunstone Gray2018-05-211-1/+1
| * Fix merge conflict infoAnnabel Dunstone Gray2018-05-211-1/+7
| * Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray2018-05-211-4/+8
* | [skip ci] Replace col-*-offset-* with offset-*-*Clement Ho2018-04-131-1/+1
* | [skip ci] .form-horizontal => .form-group.rowClement Ho2018-04-121-3/+3
* | [skip ci] .control-label to .col-form-labelClement Ho2018-04-111-1/+1
* | Rename col-xs-* to col-*Clement Ho2018-04-091-2/+2
|/
* remove merge_conflicts bundle in favor of pages directory entry pointMike Greiling2018-02-271-2/+0
* Chart.html.haml refactorJacob Schatz2018-02-191-2/+2
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-052-3/+3
* Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-0/+38
* Add a bunch of missing translationsBob Van Landuyt2017-06-151-1/+1
* removes old css class from everywhere27291-unify-mr-diff-file-buttonsNur Rony2017-02-021-1/+1
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-314-16/+16
* HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya2016-12-311-1/+1
* Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran2016-11-102-22/+0
* VueJSMigration: Remove parallel-conflict-line component.Fatih Acet2016-11-101-1/+10
* VueJS migration, replace {{{ with v-htmlFatih Acet2016-11-102-5/+3
* Fix discard messageAlfredo Sumaran2016-10-131-1/+1
* Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-138-50/+39
* Improve diff view switching and componentsAlfredo Sumaran2016-10-134-54/+34
* Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran2016-10-131-1/+1
* Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-134-25/+26
* Refactor JS codeAlfredo Sumaran2016-10-132-4/+3
* Replace loading text with spinnerAlfredo Sumaran2016-10-131-1/+2
* Style for resolve conflicts formAlfredo Sumaran2016-10-131-10/+17
* Styles for discard alertAlfredo Sumaran2016-10-131-3/+4
* Replace textarea with Ace editorAlfredo Sumaran2016-10-131-1/+1
* Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-136-19/+37
* Fix hard coded plural text.Fatih Acet2016-08-131-1/+1
* Disable commit button if commit message textarea empty.Fatih Acet2016-08-121-3/+2
* Remove commit button loader and update title while committing.Fatih Acet2016-08-121-1/+1
* Minor code style tweaks in viewsDouwe Maan2016-08-122-12/+12
View Lorry Controller Status