summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possibleAdam Niedzielski2016-12-012-2/+2
* Merge branch 'fix/rename-merge-request-head-pipeline' into 'master' Kamil Trzciński2016-11-302-3/+3
|\
| * Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-292-3/+3
* | Fix pipelines info being hidden in merge request widget25055-pipelines-info-missing-from-mr-widgetAdam Niedzielski2016-11-291-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-282-5/+8
* Merge branch '24266-afraid-to-press-the-orange-button-on-merge-request-screen...Fatih Acet2016-11-221-1/+1
|\
| * If Build running change accept merge request when build succeeds button from ...Dimitrie Hoekstra2016-11-181-1/+1
* | Merge branch '24639-mr-widget-updates' into 'master' Fatih Acet2016-11-221-3/+0
|\ \
| * | Remove view details link from MR widget24639-mr-widget-updatesAnnabel Dunstone Gray2016-11-181-3/+0
| |/
* | Merge branch 'ci-style-tweaks-8.14' into 'master' Annabel Dunstone Gray2016-11-221-1/+1
|\ \
| * | additional fixesDimitrie Hoekstra2016-11-221-1/+1
* | | Merge branch 'hide-empty-merge-request-diffs' into 'master' Sean McGivern2016-11-211-2/+2
|\ \ \ | |/ / |/| |
| * | Warn that branch does not exist instead of saying that there isAdam Niedzielski2016-11-211-2/+2
| |/
* | Fix a wrong "The build for this merge request failed" message24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-runningRémy Coutable2016-11-211-1/+1
|/
* More aggressively preload on merge request and issue index pagesDouwe Maan2016-11-181-0/+3
* Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran2016-11-103-26/+1
* Fixed up resolve discussionsPhil Hughes2016-11-101-8/+9
* VueJSMigration: Remove parallel-conflict-line component.Fatih Acet2016-11-101-1/+10
* VueJS migration, replace {{{ with v-htmlFatih Acet2016-11-102-5/+3
* Merge branch 'show-status-from-branch' into 'master' Rémy Coutable2016-11-043-3/+5
|\
| * Always use multiline in viewLin Jen-Shin2016-10-281-1/+2
| * Use multi-line conditions in view, feedback:Lin Jen-Shin2016-10-281-1/+2
| * Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-251-1/+1
| |\
| * | Pass `@ref` along so we know which pipeline to showLin Jen-Shin2016-10-243-3/+3
* | | Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-042-1/+9
| |/ |/|
* | Merge remote-tracking branch 'upstream/master' into show-commit-status-from-s...Lin Jen-Shin2016-10-244-50/+58
|\ \ | |/
| * 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
| * Always use symbols for type on LabelsHelper#link_to_labelDouglas Barbosa Alexandre2016-10-191-1/+1
| * Remove duplication between global and the regular label partialsDouglas Barbosa Alexandre2016-10-191-1/+1
| * Merge branch '21444-pipeliens-new-mr' into 'master' Fatih Acet2016-10-192-4/+10
| |\
| | * Extract pipeline vars in merge requests controllerGrzegorz Bizon2016-10-181-1/+1
| | * Use all pipelines variable when creating merge requestGrzegorz Bizon2016-10-181-4/+4
| | * Fix variable to show multiple pipelines for MRAnnabel Dunstone Gray2016-10-182-2/+1
| | * Fix pipeline tab content display and badge countAnnabel Dunstone Gray2016-10-181-1/+1
| | * Add pipelines tab to new MRAnnabel Dunstone2016-10-181-0/+7
| * | Revert "Merge branch 'gjlaubenstein/gitlab-ce-21712-change-issue-show-html-ti...Robert Speicher2016-10-192-2/+2
| |/
* | Merge remote-tracking branch 'upstream/master' into show-commit-status-from-s...Lin Jen-Shin2016-10-1817-140/+140
|\ \ | |/
| * Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-173-16/+5
| |\
| | * 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
| | * | Moved ci_status environments logic to new action ci_envrionments_status and s...Luke Bennett2016-10-141-0/+1
| | * | Fix indenting error in HAMLZ.J. van de Weg2016-10-141-2/+2
| | * | Show what time ago a MR was deployedZ.J. van de Weg2016-10-142-15/+3
| * | | Fix discard messageAlfredo Sumaran2016-10-131-1/+1
| * | | Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-139-66/+47
| * | | Improve diff view switching and componentsAlfredo Sumaran2016-10-135-56/+49
| * | | Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran2016-10-131-1/+1
View Lorry Controller Status