summaryrefslogtreecommitdiff
path: root/app/views/projects/compare
Commit message (Collapse)AuthorAgeFilesLines
* 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-172-0/+2
|
* Style commits, branches and tags pages to match new UIDmitriy Zaporozhets2015-09-073-11/+10
|
* Remove disableButtonIf[Any]EmptyField calls from formsRobert Speicher2015-06-261-5/+3
| | | | These have been replaced by the "requiresInput" behavior.
* Add Create Merge Request buttons to commits page and push event.Douwe Maan2015-05-091-3/+4
|
* Add a page title to every page.Douwe Maan2015-04-302-0/+2
|
* Upgrade to Rails 4.1.9Vinnie Okada2015-02-141-1/+1
| | | | | | 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.
* Use button type=submit instead of input.Ciro Santilli2014-10-011-1/+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-052-9/+9
| | | | 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-312-19/+19
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update form classesDmitriy Zaporozhets2013-12-311-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Compare page improvedDmitriy Zaporozhets2013-09-123-27/+41
| | | | | | | * 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
* Add br for new sentense in Compare viewDmitriy Zaporozhets2013-08-261-2/+2
|
* Add placeholders from and toDmitriy Zaporozhets2013-08-261-3/+3
|
* People like Karen and myself are confused by the placeholder, it seems like ↵Sytse Sijbrandij2013-08-231-3/+4
| | | | you don't have to change the master value. Also the to and from should be more prominent.
* Thx Jacob.Sytse Sijbrandij2013-08-091-1/+1
|
* Better wording of diff surpression.Sytse Sijbrandij2013-08-091-2/+2
|
* Merge branch 'master' into karlhungus-mr-on-forkDmitriy Zaporozhets2013-08-081-2/+2
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: app/contexts/filter_context.rb app/contexts/search_context.rb app/models/merge_request.rb app/models/note.rb app/views/shared/_merge_requests.html.haml spec/controllers/commit_controller_spec.rb spec/services/notification_service_spec.rb
| * Replace xlarge and xxlarge classesDmitriy Zaporozhets2013-08-071-2/+2
| |
| * Dont load bootstrap buttons. Modified css with new buttonsDmitriy Zaporozhets2013-08-011-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
|/
* Restyle last push widgetDmitriy Zaporozhets2013-07-171-1/+1
|
* Replace %h5.title with div.titleDmitriy Zaporozhets2013-07-131-1/+1
|
* remove unnecessary %br/%hr and stylesDmitriy Zaporozhets2013-07-132-2/+0
|
* Replace page_title with page-title. Correct margin for some blocks/layoutsDmitriy Zaporozhets2013-07-132-2/+2
|
* Move projects controllers/views in Projects moduleDmitriy Zaporozhets2013-06-233-0/+67
View Lorry Controller Status