summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-diff_view' into 'master' Rémy Coutable2016-04-221-1/+1
|\
| * Always read diff_view setting from the cookieRobert Speicher2016-04-141-1/+1
* | Merge branch 'remove-update-files' into 'master' Yorick Peterse2016-04-211-0/+0
|\ \
| * | Removed JS update templatesremove-update-filesPhil Hughes2016-04-191-0/+0
* | | Fix undefined local variable error in Invalid MR templaters-issue-15408Robert Speicher2016-04-211-1/+1
* | | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-211-1/+2
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-193-37/+31
| |\ \ \ | | |/ /
| * | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-168-31/+30
| |\ \ \
| * | | | Optimise Merge Request builds renderingKamil Trzcinski2016-04-131-1/+2
* | | | | Merge branch 'remove-duplicate-ids' into 'master' Jacob Schatz2016-04-201-2/+2
|\ \ \ \ \
| * | | | | Removed duplicate ID's from the HTMLremove-duplicate-idsPhil Hughes2016-04-191-2/+2
| | |_|/ / | |/| | |
* | | | | Also show Revert and Cherry-pick when the source branch can't be removedDouwe Maan2016-04-201-0/+5
* | | | | Verify the MR being displayed question has a merge commit set and can be cher...Douwe Maan2016-04-202-7/+9
* | | | | Merge branch 'pmq20/gitlab-ce-issue_12785'Douwe Maan2016-04-192-1/+4
|\ \ \ \ \
| * | | | | Add support to cherry-pick any commitP.S.V.R2016-04-182-1/+4
* | | | | | Merge branch 'mr-formatting' into 'master' Robert Speicher2016-04-192-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | format merge request references properlyBen Bodenmiller2016-04-182-3/+3
| |/ / / /
* | | | | Merge branch 'change_target_branch_link_color' into 'master' Jacob Schatz2016-04-181-1/+2
|\ \ \ \ \
| * | | | | change the link color of the target branch in a merge rquestchange_target_branch_link_colorArinde Eniola2016-04-181-1/+2
| |/ / / /
* | | | | Fixed issue with tasklist toggling sidebar refreshtasklist-fixPhil Hughes2016-04-181-3/+0
|/ / / /
* | | | Updated some if statementsissues-mobile-headerPhil Hughes2016-04-161-15/+11
* | | | Fixed up based on feedbackPhil Hughes2016-04-161-1/+1
* | | | Moved meta information into an issuable helper methodPhil Hughes2016-04-161-9/+2
* | | | Merge request header markup now matches issue markup for consistancyPhil Hughes2016-04-162-34/+41
| |/ / |/| |
* | | Remove extra spacing from merge request target branch namers-branch-name-spaceRobert Speicher2016-04-151-2/+1
* | | Merge branch 'new-mr-improvements' into 'master' Rémy Coutable2016-04-154-25/+25
|\ \ \
| * | | Indented codePhil Hughes2016-04-151-8/+8
| * | | Updated MR comparenew-mr-improvementsPhil Hughes2016-04-134-25/+25
| |/ /
* | | Do not include award emojis in issue view comment_counttheoretick2016-04-142-2/+2
| |/ |/|
* | merge request form uses new GLFormPhil Hughes2016-04-142-2/+2
|/
* Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master' Jacob Schatz2016-04-121-1/+1
|\
| * fix quick submit missing in edit merge request pageArinde Eniola2016-04-071-1/+1
* | Fixed failing testsbuild-notification-fixesPhil Hughes2016-04-111-1/+1
* | Preparing build textPhil Hughes2016-04-111-1/+8
* | Build notification null checkPhil Hughes2016-04-111-6/+1
* | Merge branch 'rs-form_errors' into 'master' Dmitriy Zaporozhets2016-04-111-4/+1
|\ \
| * | Standardize the way we check for and display form errorsrs-form_errorsRobert Speicher2016-04-041-4/+1
* | | Merge branch 'mr-ui-update' into 'master' Jacob Schatz2016-04-117-63/+70
|\ \ \ | |_|/ |/| |
| * | Addressed feedbackPhil Hughes2016-04-111-2/+3
| * | Fixed buildsPhil Hughes2016-04-061-4/+4
| * | Fixed target project updatePhil Hughes2016-04-063-12/+8
| * | Checkmarks in dropdowns for already selected valuesPhil Hughes2016-04-061-7/+7
| * | Use new dropdowns for MR comparePhil Hughes2016-04-061-8/+47
| * | Updated UI for new merge requestPhil Hughes2016-04-065-54/+25
* | | Reset MR optsanti-memoizer-mr-fixJacob Schatz2016-04-061-0/+2
|/ /
* | Merge branch 'build-updates' into 'master' Douwe Maan2016-04-032-17/+24
|\ \ | |/ |/|
| * Updated based on feedbackPhil Hughes2016-03-211-20/+34
| * Updated to fix issues risen during feedbackPhil Hughes2016-03-182-38/+26
| * Merge request title is in the notificationPhil Hughes2016-03-181-2/+3
| * Commit SHA comes from JSONPhil Hughes2016-03-181-11/+4