summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/widget
Commit message (Expand)AuthorAgeFilesLines
* Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-042-1/+9
* 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
* Merge branch 'assign-issues-for-merge-request-18876' into 'master' Douwe Maan2016-10-111-0/+1
|\
| * Added link to bulk assign issues to MR author. (Issue #18876)James2016-10-061-0/+1
* | Merge branch 'replace-bootstrap-caret' into 'master' Jacob Schatz2016-10-061-1/+1
|\ \
| * | Replace bootstrap caret with fontawesome caretClement Ho2016-10-051-1/+1
| |/
* | Only hide external link text, not icon/link.deploy-widgetBryce Johnson2016-10-061-2/+3
* | Only hide deploy status external link on small screens.Bryce Johnson2016-10-061-2/+2
|/
* Changed mr widget build status to pipeline status with pipeline id, with a li...22006-change-build-wording-to-pipeline-in-mr-block-add-pipeline-idLuke Bennett2016-09-221-2/+3
* Scope environments to projectlimit-number-of-shown-environmentsKamil Trzcinski2016-09-211-1/+1
* Fix project for merge_request environmentsKamil Trzcinski2016-09-211-1/+1
* Add tests to verify the correctness of returned environmentsKamil Trzcinski2016-09-211-1/+1
* Limit number of shown environments for Merge RequestsKamil Trzcinski2016-09-211-11/+12
* Merge branch 'mc-ui'Douwe Maan2016-08-173-4/+21
|\
| * Merge branch 'master' into mc-uiDouwe Maan2016-08-151-0/+13
| |\
| * | Fix bug where merge widget wouldn't show up after resolving conflictsDouwe Maan2016-08-121-2/+8
| * | Use a regular flash message after resolution is completeDouwe Maan2016-08-121-6/+0
| * | Prevent “This merge request contains merge conflicts” from being shown af...Douwe Maan2016-08-122-2/+2
| * | Show tooltip when conflicts cannot be resolved through GitLabDouwe Maan2016-08-121-1/+7
| * | Verify user is signed in and can actually resolve conflictsDouwe Maan2016-08-121-3/+5
| * | Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?`Douwe Maan2016-08-121-1/+1
| * | Set flash message after conflict is resolvedSean McGivern2016-08-121-0/+6
| * | Don't allow resolving invalid conflictsSean McGivern2016-08-121-3/+3
| * | Make resolve these conflicts text a link to conflicts tab.Fatih Acet2016-08-121-1/+4
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Kamil Trzcinski2016-08-161-0/+13
|\ \ \ | | |/ | |/|
| * | Method names changed to #includes_commit?zj-deployment-status-on-mrZ.J. van de Weg2016-08-121-3/+6
| * | CI build status not per environmentZ.J. van de Weg2016-08-111-19/+17
| * | Tests for release status heading on MR#showZ.J. van de Weg2016-08-111-2/+2
| * | Show deployment status on a MR viewZ.J. van de Weg2016-08-111-14/+26
| |/
* | Add route, controller action, and views for MR pipelinesAnnabel Dunstone2016-07-251-1/+2
|/
* Starting work on the warn_on_failure feature for the MR build status.Connor Shea2016-07-191-1/+1
* Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-181-1/+1
* Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-1/+1
* Don't ask the user to "merge this request manually".Timothy Andrew2016-07-131-1/+1
* Merge branch 'retrieve-mr-closes-issues-just-when-required' into 'master' Rémy Coutable2016-07-081-3/+3
|\
| * Avoid calculation of closes_issues.retrieve-mr-closes-issues-just-when-requiredPaco Guzman2016-07-071-3/+3
* | Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-063-7/+7
|/
* Fixed issue with MR buttons being in a groupmr-buttons-updatePhil Hughes2016-06-132-40/+23
* Rename ci_commit -> pipelineRémy Coutable2016-06-101-1/+1
* Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergea...Rémy Coutable2016-06-101-1/+1
* Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'...Rémy Coutable2016-06-101-1/+1
* Allow or not merge MR with failed buildRui Anderson2016-06-103-13/+22
* Merge branch 'merge-conflicts-icon-color' into 'master' Jacob Schatz2016-06-091-2/+2
|\
| * Use warning color merge conflicts icon in MR status widget.merge-conflicts-icon-colorFatih Acet2016-06-061-2/+2
* | Rename all ci_commit[s] in application code to pipeline[s]Kamil Trzcinski2016-06-032-5/+5
* | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-033-1/+8
|\ \ | |/
| * fixup! Don't allow merges with new commits14139-sha-parameter-in-accept-merge-request-apiSean McGivern2016-06-021-2/+2
| * Don't allow merges with new commitsSean McGivern2016-06-013-1/+8
View Lorry Controller Status