summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Fixed failing issues testsPhil Hughes2016-02-221-10/+2
* Merge branch 'issue_3409' into 'master' Robert Speicher2016-02-193-8/+19
|\
| * More updates from the last code review.Rubén Dávila2016-02-194-13/+15
| * Some updates from last code review.Rubén Dávila2016-02-192-11/+16
| * Make #commit_with_hooks return the new obj id plus some other fixes.Rubén Dávila2016-02-191-2/+2
| * Don't show revert button if commit/MR has already been reverted.Rubén Dávila2016-02-192-3/+3
| * Refactor revert_commit_link helper.Rubén Dávila2016-02-191-1/+1
| * Use a custom title in the revert modal.Rubén Dávila2016-02-191-1/+1
| * Move revert link to the MR widget section plus some refactor.Rubén Dávila2016-02-192-3/+2
| * Some updates after last code review.Rubén Dávila2016-02-191-11/+1
| * Add link to fork if user can't revert MR.Rubén Dávila2016-02-192-2/+13
| * Reuser revert commit modal in MR detail page.Rubén Dávila2016-02-191-1/+3
| * Some updates from last code review.Rubén Dávila2016-02-191-1/+1
| * Add new endpoint and button to revert merge. #3409Rubén Dávila2016-02-191-1/+3
* | Consistency in MR and issue header.bugfix/jschatz1/issuable-consistencyJacob Schatz2016-02-181-1/+1
|/
* Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan2016-02-171-0/+19
|\
| * Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issuesDouglas Barbosa Alexandre2016-02-171-0/+19
* | Fix a bug preventing from doing subsequent edits in any Issuable sidebarfix/13517-impossible-subsequent-issuable-edits-in-sidebarRémy Coutable2016-02-171-3/+3
|/
* Edited time ago location change.Jacob Schatz2016-02-052-5/+5
* Re-use top-are css component for issues/mr pagesDmitriy Zaporozhets2016-02-051-7/+10
* Allow link_to_label to take an optional type argrymai/gitlab-ce-3007-fix-mr-label-linksRémy Coutable2016-02-041-1/+1
* Sidebar works after sidebar ajax calls.Jacob Schatz2016-02-021-2/+2
* Add ajax calls to return JSONJacob Schatz2016-01-301-1/+0
* New right side gutter design.Jacob Schatz2016-01-271-3/+3
* Remove gray background from issue/mr/milestone backgroundissuable-white-bgDmitriy Zaporozhets2016-01-223-3/+3
* Merge branch 'issue_2239' into 'master' Dmitriy Zaporozhets2016-01-221-0/+4
|\
| * Add link for checkout MRs info.issue_2239Rubén Dávila2016-01-211-0/+4
* | Implement new UI for paginationDmitriy Zaporozhets2016-01-201-5/+0
* | Fix MR diff_refsDouwe Maan2016-01-202-2/+2
* | Merge branch 'master' into issue_3945Rubén Dávila2016-01-145-8/+9
|\ \ | |/
| * Replace all navigation menu with nav-links classDmitriy Zaporozhets2016-01-132-2/+2
| * gets merge request discussion working againcomment-and-close-button-does-not-submit-commentJacob Schatz2016-01-121-2/+2
| * removing last chunk of MR ajax changes, rest will be in another MRJacob Schatz2016-01-123-3/+3
| * reverting more MR ajax files, will appear in different commitJacob Schatz2016-01-123-25/+30
| * reverting _mr_title.html.hamlJacob Schatz2016-01-121-16/+10
| * reverting _disscusionJacob Schatz2016-01-121-4/+5
| * fixes conflictsJacob Schatz2016-01-113-4/+5
| |\
| | * Get "Merge when build succeeds" to work when commits were pushed to MR target...Douwe Maan2016-01-051-1/+1
| | * Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master' Douwe Maan2016-01-051-2/+3
| | |\
| | | * Fix testsJosh Frye2016-01-031-1/+1
| | | * Show 'New Merge Request' buttons on canonical repo.Josh Frye2016-01-031-2/+3
| | * | number_with_delimiter most of the thingsrs-delimit-all-the-thingsRobert Speicher2015-12-311-1/+1
| | |/
| * | initial json requests instead of HTMLJacob Schatz2016-01-076-33/+28
| * | adds ajax open and close merges, with discussion/comments working as wellJacob Schatz2016-01-052-15/+20
| |/
* | More refactoring from last code review. #3945Rubén Dávila2016-01-142-2/+3
* | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-072-2/+2
|/
* Merge branch 'rs-opengraph' into 'master' Douwe Maan2015-12-251-1/+4
|\
| * Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-241-2/+3
| * Add page descriptions and imagesRobert Speicher2015-12-231-1/+3
* | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-241-1/+1
|\ \ | |/ |/|