summaryrefslogtreecommitdiff
path: root/app/views/projects/compare/show.html.haml
Commit message (Collapse)AuthorAgeFilesLines
* [skip ci] Convert wells to card, port info-wellClement Ho2018-04-131-1/+1
|
* Replace use of capture_haml with captureJames Ramsay2018-01-031-2/+2
|
* Fix incorrect case of ruby varsJames Ramsay2018-01-031-3/+3
|
* Remove superfluous i18n namespacesJames Ramsay2018-01-031-1/+1
|
* Add i18n helpers to branch comparison viewJames Ramsay2018-01-021-7/+8
|
* Remove all old sub nav barsAnnabel Dunstone Gray2017-09-251-1/+0
|
* style updatesPhil Hughes2017-08-181-1/+1
| | | | fixed some more breadcrumb titles
* updated a bunch of breadcrumb titlesPhil Hughes2017-08-181-2/+0
| | | | [ci skip]
* fixed some inconsistenciesPhil Hughes2017-07-121-0/+1
|
* rename methodPhil Hughes2017-07-071-1/+1
|
* fixed breadcrumb titlesPhil Hughes2017-07-071-1/+1
|
* improvements to breadcrumb titles, links & nestingPhil Hughes2017-07-061-0/+2
|
* Consistently use monospace font for commit SHAs and branch and tag namesDouwe Maan2017-05-121-2/+2
|
* Add 'View on [env]' link to blobs and individual files in diffsDouwe Maan2017-02-061-1/+1
|
* HAMLLint: Fix `UnnecessaryInterpolation` offencesKushal Pandya2017-01-241-2/+2
|
* Introduce Compare model in the codebase.Paco Guzman2016-08-031-1/+1
| | | This object will manage Gitlab::Git::Compare instances
* Cache highlighted diff lines for merge requestsPaco Guzman2016-08-031-1/+1
| | | | Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
* Remove unnecessary parenscode_style_fixesValery Sizov2016-06-301-1/+1
|
* Update gray block under subnav to match other pages18934-compare-gray-blockAnnabel Dunstone2016-06-211-18/+18
|
* Remove header title from project pagesDmitriy Zaporozhets2016-05-261-1/+0
| | | | | | | With new navigation design it makes no sense to duplicate title in the header Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Start builds redesignAnnabel Dunstone2016-05-041-1/+1
|
* Change strategy to highlight diffs. #3945Rubén Dávila2016-01-071-1/+1
| | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content.
* Use gl-padding instead of 15px/20px where appropriateDouwe Maan2015-12-021-2/+2
|
* Move project header title definition to view in question.Douwe Maan2015-09-171-0/+1
|
* Style commits, branches and tags pages to match new UIDmitriy Zaporozhets2015-09-071-6/+6
|
* Add a page title to every page.Douwe Maan2015-04-301-0/+1
|
* Factor out commit list from compare and new MR.Ciro Santilli2014-09-141-13/+1
|
* Fix all broken stuff after diff refactoringDmitriy Zaporozhets2014-09-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Turn if/else branch vor valid compare error messageRobert Schilling2014-08-111-2/+2
|
* Refactor diff suppress logic and diff viewsDmitriy Zaporozhets2014-07-151-12/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Replace HTML5 obsolete center element with CSS.Ciro Santilli2014-06-211-1/+1
| | | | Fix #6901. Would generate invalid HTML5.
* Replace ui-box title with panel-headingDmitriy Zaporozhets2014-05-291-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Replace ui-box with panel.panel-defaultDmitriy Zaporozhets2014-05-291-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Change Diff to Changes in views.Marin Jankovski2014-03-261-4/+4
|
* Prevent 500 error on Compare page if diff read timout happensDmitriy Zaporozhets2014-02-051-3/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use MergeRequestDiff::COMMITS_SAFE_SIZE for Compare diff limit.Dmitriy Zaporozhets2014-02-051-8/+8
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Prevent Compare page timout for large amount of commitsDmitriy Zaporozhets2014-02-051-1/+8
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix compare view and servicesDmitriy Zaporozhets2013-12-311-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Compare page improvedDmitriy Zaporozhets2013-09-121-0/+13
| | | | | | | * Show new merge request button from compare page * Show message if user selected same branches * Show message if compared branches are the same * Prepend inputs with from/to labels
* Thx Jacob.Sytse Sijbrandij2013-08-091-1/+1
|
* Better wording of diff surpression.Sytse Sijbrandij2013-08-091-2/+2
|
* Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into ↵Dmitriy Zaporozhets2013-07-301-2/+2
|\ | | | | | | | | | | | | | | | | karlhungus-mr-on-fork Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml
| * Rebased on 6.0Izaak Alpert2013-07-171-1/+1
| | | | | | | | | | | | -Had to do some minor test clean up as well Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
| * MR on Fork multiple fixesIzaak Alpert2013-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
| * Merge Request on forked projectsIzaak Alpert2013-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
* | Fix typosJohannes Schleifenbaum2013-07-291-1/+1
|/
* Replace %h5.title with div.titleDmitriy Zaporozhets2013-07-131-1/+1
|
* remove unnecessary %br/%hr and stylesDmitriy Zaporozhets2013-07-131-1/+0
|
* Replace page_title with page-title. Correct margin for some blocks/layoutsDmitriy Zaporozhets2013-07-131-1/+1
|
* Move projects controllers/views in Projects moduleDmitriy Zaporozhets2013-06-231-0/+23
View Lorry Controller Status