summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into rollback-component-vuerollback-component-vueFilipa Lacerda2017-04-208-59/+71
|\
| * Merge branch 'environments-vue-2' into 'master' Phil Hughes2017-04-208-59/+71
| |\
| | * Refactor into .vue files part 2Filipa Lacerda2017-04-208-59/+71
| |/
* | Merge branch 'master' into rollback-component-vueFilipa Lacerda2017-04-20101-546/+791
|\ \ | |/
| * Merge branch 'plantuml-filter-after-highlight' into 'master' Sean McGivern2017-04-203-8/+12
| |\
| | * Fix PlantUML integration in GFMplantuml-filter-after-highlightAdam Niedzielski2017-04-193-8/+12
| * | Merge branch 'dm-markup-helper-constants' into 'master' Robert Speicher2017-04-201-9/+16
| |\ \
| | * | Use constants in Gitlab::MarkupHelperDouwe Maan2017-04-201-9/+16
| |/ /
| * | Merge branch 'dm-fix-editing-files-on-forks' into 'master' Robert Speicher2017-04-2047-459/+274
| |\ \
| | * | Refactor changing files in web UIDouwe Maan2017-04-2047-459/+274
| |/ /
| * | Merge branch 'hook_retries' into 'master' Douwe Maan2017-04-192-0/+6
| |\ \
| | * | Add retry to system hook workerDrew Blessing2017-04-192-0/+6
| * | | Merge branch 'sh-issue-29247-fix' into 'master' Douwe Maan2017-04-194-0/+33
| |\ \ \
| | * | | Don't delete a branch involved in an open merge request in "Delete all merged...sh-issue-29247-fixStan Hu2017-04-194-0/+33
| * | | | Merge branch '30951-start-discussion-toggle-clicking-divider-causes-ui-break'...Alfredo Sumaran2017-04-197-6/+47
| |\ \ \ \
| | * | | | Resolve "start discussion toggle clicking divider causes UI break"Luke "Jared" Bennett2017-04-197-6/+47
| |/ / / /
| * | | | Merge branch 'sh-add-index-to-system-note-metadata' into 'master' Sean McGivern2017-04-193-1/+24
| |\ \ \ \
| | * | | | Add unique index for note_id to system note metadata tablesh-add-index-to-system-note-metadataStan Hu2017-04-193-1/+24
| | |/ / /
| * | | | Merge branch 'query-users-by-extern-uid' into 'master'Robert Speicher2017-04-195-8/+59
| |\ \ \ \
| | * | | | Implement search by extern_uid in Users APIRobin Bobbitt2017-04-185-8/+59
| * | | | | Merge branch '29977-style-comments-and-system-notes-real-time-updates' into '...Clement Ho2017-04-198-32/+196
| |\ \ \ \ \
| | * | | | | Add renderNote animation and added specLuke "Jared" Bennett2017-04-198-32/+196
| |/ / / / /
| * | | | | Merge branch 'right-sidebar-closed-default-mobile' into 'master' Alfredo Sumaran2017-04-194-0/+30
| |\ \ \ \ \
| | * | | | | Set the issuable sidebar to remain collapsed on mobile devicesJose Ivan Vargas Lopez2017-04-194-0/+30
| |/ / / / /
| * | | | | Merge branch 'branches-sort-toggle-empty' into 'master' Alfredo Sumaran2017-04-192-9/+15
| |\ \ \ \ \
| | * | | | | Fixed branches sort toggle being emptybranches-sort-toggle-emptyPhil Hughes2017-04-182-9/+15
| * | | | | | Merge branch 'fix-link-prometheus-opening-outside-gitlab' into 'master' Phil Hughes2017-04-192-1/+4
| |\ \ \ \ \ \
| | * | | | | | Removed target blank from the environments componentJose Ivan Vargas Lopez2017-04-192-1/+4
| |/ / / / / /
| * | | | | | Merge branch 'patch-7' into 'master' Sean McGivern2017-04-191-1/+1
| |\ \ \ \ \ \
| | * | | | | | Update groups.md found typojoe d2017-04-191-1/+1
| * | | | | | | Merge branch 'group-milestone-date-fields-fix' into 'master' Filipa Lacerda2017-04-194-3/+46
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fixed group milestones date pickers not workinggroup-milestone-date-fields-fixPhil Hughes2017-04-194-3/+46
| * | | | | | | Merge branch '30484-profile-dropdown-account-name' into 'master' Annabel Dunstone Gray2017-04-197-7/+24
| |\ \ \ \ \ \ \
| | * | | | | | | Added profile name to user dropdownDimitrie Hoekstra2017-04-197-7/+24
| |/ / / / / / /
| * | | | | | | Merge branch '29734-prometheus-monitoring-page-displays-button-to-control-man...Annabel Dunstone Gray2017-04-192-3/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Remove manual deployment controls from Environment metrics pageJoshua Lambert2017-04-192-3/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'master' into rollback-component-vueFilipa Lacerda2017-04-1980-79/+1962
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '31137-ensure-yarn-installed' into 'master' Alfredo Sumaran2017-04-191-7/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Remove node modules cache because we already use artifactsLin Jen-Shin (godfat)2017-04-191-7/+0
| |/ / / / / / /
| * | | | | | | Merge branch 'project-group-icon-links' into 'master' Annabel Dunstone Gray2017-04-193-5/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed project & group icons not being clickableproject-group-icon-linksPhil Hughes2017-04-193-5/+11
| | |/ / / / / /
| * | | | | | | Merge branch 'issuable-state-only-notes-and-description' into 'master' Sean McGivern2017-04-194-13/+25
| |\ \ \ \ \ \ \
| | * | | | | | | Display issuable state only in notes and issuable descriptionAdam Niedzielski2017-04-194-13/+25
| | |/ / / / / /
| * | | | | | | Merge branch '30985-cancel-pipelines' into 'master'Phil Hughes2017-04-195-4/+20
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Use refs instead of query the DOMFilipa Lacerda2017-04-192-2/+4
| | * | | | | | Merge branch 'master' into 30985-cancel-pipelinesFilipa Lacerda2017-04-1966-2656/+2677
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Remove unused argument30985-cancel-pipelinesFilipa Lacerda2017-04-191-1/+1
| | * | | | | | Only destroy the component's tooltipFilipa Lacerda2017-04-195-10/+14
| | * | | | | | Merge branch 'master' into 30985-cancel-pipelinesFilipa Lacerda2017-04-1939-98/+360
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Destroy tooltip in async buttons and tooltipsFilipa Lacerda2017-04-185-0/+10