summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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
|\ \ | |/ |/|
| * Merge branch 'master' into edit-on-forkDouwe Maan2015-12-181-3/+3
| |\
| * | Satisfy RubocopDouwe Maan2015-12-181-1/+1
* | | new button sizesAndriy Dyadyura2015-12-232-5/+5
* | | Merge branch 'remove-extra-spaces' into 'master' Robert Speicher2015-12-181-8/+4
|\ \ \ | |_|/ |/| |
| * | Remove extra spaces after branchnameZeger-Jan van de Weg2015-12-181-8/+4
* | | Fix merge-request-reopen button titlefix/mr-reopen-button-titleGrzegorz Bizon2015-12-181-3/+3
| |/ |/|
* | Revert sidebar position for issue and merge requestDmitriy Zaporozhets2015-12-173-69/+68
|/
* Merge branch 'move-mr-builds-tab' into 'master' Dmitriy Zaporozhets2015-12-162-11/+11
|\
| * Move MR Builds tab next to CommitsDouwe Maan2015-12-162-11/+11
* | Fix merge widget JS for buttonsfix-merge-immediately-buttonDouwe Maan2015-12-161-10/+8
* | Fix updating and disabling merge button when Merge Immediately is clickedDouwe Maan2015-12-161-4/+4
|/
* Rename .issuable-details to .detail-page (and -header and -description)Douwe Maan2015-12-163-6/+8
* Fix clipboard buttons on MR instructions and Commit#showrs-clipboard-fixesRobert Speicher2015-12-151-6/+6
* Merge branch 'tweak-flow-merge-when-build-succeeds' into 'master' Douwe Maan2015-12-141-1/+1
|\
| * Minor fix in flow 'Merge when build succeeds'Zeger-Jan van de Weg2015-12-111-1/+1
* | Merge branch 'ui-right-sidebar' into 'master' Dmitriy Zaporozhets2015-12-114-83/+74
|\ \
| * | Move awards back to gray panel and few improvements to sidebarDmitriy Zaporozhets2015-12-113-3/+3
| * | Implement new sidebar for merge request pageDmitriy Zaporozhets2015-12-115-84/+75
| |/
* | Merge branch 'fix-typo' into 'master' Robert Speicher2015-12-111-1/+1
|\ \ | |/ |/|
| * Fix typoZeger-Jan van de Weg2015-12-101-1/+1
* | Remove check icon from merged requestsremove_check_icon_from_mr_pageAchilleas Pipinellis2015-12-101-1/+0
* | Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-1012-61/+154
|\ \
| * \ Merge remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-091-16/+25
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into mr-brokenDouwe Maan2015-12-086-18/+13
| | |\
| | * | Add indication to merge request list item that MR cannot be merged automaticallyDouwe Maan2015-12-081-16/+25
| * | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-094-17/+36
| |\ \ \
| | * | | Move Builds tab to the endDouwe Maan2015-12-082-14/+14
| | * | | Merge branch 'master' into mr-buildsDouwe Maan2015-12-086-28/+22
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Change text of MR widget headingDouwe Maan2015-12-081-5/+10
| | * | | Add Builds tab to MR detail pageDouwe Maan2015-12-084-3/+18
| | | |/ | | |/|
| * | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-087-20/+15
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'rs-clipboard-selector' into 'master' Robert Speicher2015-12-081-1/+1
| | |\ \
View Lorry Controller Status