summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/_show.html.haml
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-031-4/+4
|\
| * Remove turbolinks.Bryce Johnson2017-02-021-4/+4
* | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-281-1/+1
|\ \ | |/
| * Fixed merge request tabs extra marginPhil Hughes2017-01-271-2/+1
* | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-271-3/+3
|\ \ | |/
| * HAMLLint: Fix `RubyComments` offencesKushal Pandya2017-01-241-3/+3
* | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-181-0/+3
|\ \ | |/
| * Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-181-0/+1
| |\
| | * Backport timetracking frontend to CE.Bryce Johnson2017-01-151-0/+1
| * | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-171-0/+3
| |\ \ | | |/ | |/|
| | * Address MR commentsJarka Kadlecova2017-01-131-1/+2
| | * refresh merge widget after using /merge commandJarka Kadlecova2017-01-111-0/+2
* | | Merge branch 'master' into go-go-gadget-webpackPhil Hughes2017-01-131-2/+2
|\ \ \ | |/ /
| * | Merge branch 'side-by-side-fixed-width' into 'master' Fatih Acet2017-01-111-2/+2
| |\ \ | | |/ | |/|
| | * Keep max width on MR content on side by side viewside-by-side-fixed-widthAnnabel Dunstone Gray2017-01-051-2/+2
* | | migrate all javascript asset bundles and require syntaxMike Greiling2017-01-101-1/+1
|/ /
* | render merge request tabs regardless of commit historyMike Greiling2017-01-031-47/+46
|/
* Removed bottom padding from merge manually from CLI because of repositioning ...additional-award-emoji-repositioning-fixesdimitrieh2017-01-021-1/+1
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-311-3/+3
* Move award emoji's out of the discussion tab for merge requestsdimitrieh2016-12-281-3/+3
* Removes builds tab from merge requestFilipa Lacerda2016-12-211-7/+0
* Merge branch '20916-issues-mrs-linelength' into 'master' Annabel Dunstone Gray2016-12-161-1/+2
|\
| * Limit description container for mrs while viewing side by side diff20916-issues-mrs-linelengthtauriedavis2016-12-151-1/+1
| * Add content_class for limited widthAnnabel Dunstone Gray2016-12-091-0/+1
* | Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan2016-12-151-1/+1
|/
* add link_to_if helper on target_branch link on Merge Request show page for ca...Rydkin Maxim2016-12-081-1/+1
* Prevent error when submitting a merge request and pipeline is not defined24860-actionview-template-error-undefined-method-size-for-nil-nilclassAdam Niedzielski2016-11-281-2/+3
* Fixed up resolve discussionsPhil Hughes2016-11-101-8/+9
* Fixed issues with sticky mr tabs & sidebarPhil Hughes2016-10-201-33/+35
* Fix the merge request view when source projects or branches are removedNick Thomas2016-10-201-5/+8
* Revert "Add #closed_without_source_project?"Nick Thomas2016-10-201-17/+14
* Merge branch '21444-pipeliens-new-mr' into 'master' Fatih Acet2016-10-191-1/+1
|\
| * Extract pipeline vars in merge requests controllerGrzegorz Bizon2016-10-181-1/+1
* | Revert "Merge branch 'gjlaubenstein/gitlab-ce-21712-change-issue-show-html-ti...Robert Speicher2016-10-191-1/+1
|/
* Merge branch 'mr-tabs-affix' into 'master' Fatih Acet2016-10-141-1/+1
|\
| * Don't run affix tabs in test envmr-tabs-affixPhil Hughes2016-10-101-1/+1
| * Merge request tabs stick when scrolling pagePhil Hughes2016-10-061-1/+1
* | reword html titles for merge requests and issuesGreg Laubenstein2016-10-091-1/+1
* | Replace bootstrap caret with fontawesome caretClement Ho2016-10-051-1/+1
|/
* ensure the 'fixed layout' preference is honored whenever possibleMike Greiling2016-09-201-3/+0
* Add #closed_without_source_project?Katarzyna Kobierska2016-09-131-14/+17
* fix margin for awards-control buttonstauriedavis2016-09-061-1/+1
* Support integration with Koding (online IDE)Gokmen Goksel2016-08-191-0/+3
* Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-171-4/+10
|\
| * Add pipelines badge to MR tabAnnabel Dunstone2016-08-161-1/+1
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Kamil Trzcinski2016-08-161-1/+1
| |\
| * | Use merge_request_diff instead of doubles for testing pipelines for Merge Req...Kamil Trzcinski2016-08-151-5/+5
| * | Display all pipelines for Merge RequestAnnabel Dunstone2016-07-251-1/+1
| * | Add route, controller action, and views for MR pipelinesAnnabel Dunstone2016-07-251-0/+6
* | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-121-1/+1
|\ \ \ | | |/ | |/|
View Lorry Controller Status