summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove index from pipeline toggles18141-pipeline-graphAnnabel Dunstone2016-08-172-10/+12
|
* Merge master into branchAnnabel Dunstone2016-08-1760-89/+13748
|\
| * Merge branch 'mc-ui'Douwe Maan2016-08-1741-44/+2097
| |\ | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb
| | * Use bundled Vue libmc-uiSean McGivern2016-08-172-10074/+1
| | |
| | * Merge remote-tracking branch 'origin/master' into mc-uiSean McGivern2016-08-17168-691/+14303
| | |\
| | * | Reference the version 'UI resolve conflicts' was introducedAchilleas Pipinellis2016-08-171-0/+4
| | | | | | | | | | | | | | | | [ci skip]
| | * | Add workaround for JS error in specSean McGivern2016-08-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | These JS errors are only thrown in PhantomJS, and enough of the page is rendered properly that this spec passes. We should remove this in future.
| | * | Merge branch 'master' into mc-uiDouwe Maan2016-08-1595-350/+1634
| | |\ \
| | * | | Satisfy scss-lintDouwe Maan2016-08-151-4/+4
| | | | |
| | * | | Fix hard coded plural text.Fatih Acet2016-08-132-2/+4
| | | | |
| | * | | CSS theme improvements for MC UI.Fatih Acet2016-08-121-12/+55
| | | | |
| | * | | Disable commit button if commit message textarea empty.Fatih Acet2016-08-122-5/+10
| | | | |
| | * | | Remove commit button loader and update title while committing.Fatih Acet2016-08-123-3/+11
| | | | |
| | * | | Remove unnecessary window exports.Fatih Acet2016-08-122-3/+3
| | | | |
| | * | | Change left and right position for parallel lines.Fatih Acet2016-08-121-2/+2
| | | | |
| | * | | Fix failed test because of a copy change.Fatih Acet2016-08-121-1/+1
| | | | |
| | * | | Prefer lowercase hex values as declared in styling guideline.Fatih Acet2016-08-121-39/+39
| | | | |
| | * | | Fix bug where merge widget wouldn't show up after resolving conflictsDouwe Maan2016-08-121-2/+8
| | | | |
| | * | | Minor code style tweaks in viewsDouwe Maan2016-08-122-12/+12
| | | | |
| | * | | “Showing N conflicts for A into B” -> “Showing N conflicts between A ↵Douwe Maan2016-08-121-2/+2
| | | | | | | | | | | | | | | | | | | | and B”
| | * | | Fix bug where conflict view would have one too many context sectionsDouwe Maan2016-08-121-2/+4
| | | | |
| | * | | Use a regular flash message after resolution is completeDouwe Maan2016-08-122-8/+1
| | | | |
| | * | | Prevent “This merge request contains merge conflicts” from being shown ↵Douwe Maan2016-08-124-4/+4
| | | | | | | | | | | | | | | | | | | | after resolution because of slow background workers
| | * | | Get conflict resolution to work for MRs from forksDouwe Maan2016-08-121-1/+1
| | | | |
| | * | | Don’t hardcode pathsDouwe Maan2016-08-123-6/+5
| | | | |
| | * | | Show tooltip when conflicts cannot be resolved through GitLabDouwe Maan2016-08-121-1/+7
| | | | |
| | * | | Show appropriate message when conflicts have already been resolvedDouwe Maan2016-08-122-7/+19
| | | | |
| | * | | Verify user is signed in and can actually resolve conflictsDouwe Maan2016-08-123-3/+16
| | | | |
| | * | | Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?`Douwe Maan2016-08-124-15/+17
| | | | |
| | * | | Use mixin to create color schemes.Fatih Acet2016-08-121-275/+112
| | | | | | | | | | | | | | | | | | | | Some SCSS Foo in action! :boom:
| | * | | Implement color schemes for MC UI.Fatih Acet2016-08-121-39/+313
| | | | |
| | * | | Separate inline haml vue templates into new files.Fatih Acet2016-08-125-107/+104
| | | | |
| | * | | Simplify Haml template and Scss files for MC UI.Fatih Acet2016-08-122-97/+24
| | | | |
| | * | | Dynamically highlight code blocks in merge conflicts widgets.Fatih Acet2016-08-122-5/+10
| | | | |
| | * | | Update container fludity class if diff view mode is parallel.Fatih Acet2016-08-121-0/+3
| | | | |
| | * | | Update button titles in merge conflicts widget header.Fatih Acet2016-08-122-4/+11
| | | | |
| | * | | Show loading button while Ajax request is in progress.Fatih Acet2016-08-124-18/+35
| | | | |
| | * | | Add merge conflict docsSean McGivern2016-08-123-0/+37
| | | | |
| | * | | Find match line headers by backtrackingSean McGivern2016-08-122-11/+128
| | | | | | | | | | | | | | | | | | | | | | | | | This is more efficient for large files than performing a regex match on every single line.
| | * | | Add more tests for conflictsSean McGivern2016-08-128-32/+156
| | | | |
| | * | | Set flash message after conflict is resolvedSean McGivern2016-08-123-3/+12
| | | | |
| | * | | Remove undo endpointSean McGivern2016-08-123-26/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 2536fea8db0967a817615eb3e951eb6ba22f8ede.
| | * | | Move resolving code to ResolveServiceSean McGivern2016-08-125-30/+40
| | | | |
| | * | | Clarify Conflict::File#sections methodSean McGivern2016-08-122-14/+31
| | | | |
| | * | | Don't allow resolving invalid conflictsSean McGivern2016-08-125-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An MR can only be resolved in the UI if: - It has conflicts. - It has valid diff_refs (in other words, it supports new diff notes). - It has no conflicts with one side missing. - It has no conflicts in binary files. - It has no conflicts in files too large to display. - It has no conflicts containing invalid conflict markers.
| | * | | Prefer v-show instead of v-if.Fatih Acet2016-08-121-2/+2
| | | | |
| | * | | Add file icon and blob link.Fatih Acet2016-08-122-7/+13
| | | | |
| | * | | Draw side-by-side view only one table.Fatih Acet2016-08-123-54/+110
| | | | |
| | * | | Put file blob link as href.Fatih Acet2016-08-121-2/+4
| | | | |
| | * | | Handle renamed files in file header.Fatih Acet2016-08-122-2/+11
| | | | |
View Lorry Controller Status