summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Be explicit on merge request discussion variables19702-define_show_html_varsPaco Guzman2016-07-123-10/+41
* Merge branch 'dz-ui-guide-nav' into 'master' Dmitriy Zaporozhets2016-07-121-0/+2
|\
| * Improve wording in UI guideDmitriy Zaporozhets2016-07-121-1/+1
| * Fix typo in UI guidedz-ui-guide-navDmitriy Zaporozhets2016-07-111-1/+1
| * Add rule about adding new header tab to the ui guideDmitriy Zaporozhets2016-07-111-0/+2
* | Merge branch 'update-health-check-gem' into 'master' Rémy Coutable2016-07-124-17/+5
|\ \
| * | Update the health_check gem to the latest releaseupdate-health-check-gemDJ Mountney2016-07-114-17/+5
| |/
* | Merge branch 'remove-branch-api' into 'master' Rémy Coutable2016-07-124-7/+30
|\ \
| * | api: expose {should,force}_remove_source_branchBen Boeckel2016-07-114-7/+30
| |/
* | Merge branch 'copy-to-clipboard-tooltip' into 'master' Rémy Coutable2016-07-125-24/+9
|\ \
| * | Display tooltip for "Copy to Clipboard" button (!5164)winniehell2016-07-115-24/+9
* | | Merge branch 'quick-start-ci-route' into 'master' Douwe Maan2016-07-1238-75/+67
|\ \ \
| * | | Fix failing tests.Connor Shea2016-07-113-22/+15
| * | | Clean path infoConnor Shea2016-07-111-1/+1
| * | | Update the help_page_path route to accept paths directly instead of using par...Connor Shea2016-07-1136-54/+52
| * | | Make "Get started with Builds" Help Page link work properlyconnorshea2016-07-112-1/+2
* | | | Merge branch 'optimize-cross-ref-system-notes-check' into 'master' Douwe Maan2016-07-128-23/+107
|\ \ \ \
| * | | | Optimize system note visibility checking by hiding notes thatStan Hu2016-07-118-23/+107
| |/ / /
* | | | Merge branch 'contrib-calendar-tooltip-name' into 'master' Jacob Schatz2016-07-113-2/+8
|\ \ \ \
| * | | | Added day name to contributions calendarcontrib-calendar-tooltip-namePhil Hughes2016-07-043-2/+8
* | | | | Merge branch 'master' into faster-diffsfaster-diffsJacob Schatz2016-07-11166-1056/+3162
|\ \ \ \ \
| * \ \ \ \ Merge branch 'remove-pinto-from-flash' into 'master' Jacob Schatz2016-07-117-21/+46
| |\ \ \ \ \
| | * | | | | Remove `pinTo` from `Flash` and make inline flash messages look nicer (!4854)winniehell2016-06-307-21/+46
| * | | | | | Normalize spacing for version numbers in CHANGELOGRobert Speicher2016-07-111-3/+3
| * | | | | | Merge branch 'cleanup-coffeescripts-from-gitlab-ci' into 'master' Jacob Schatz2016-07-115-20/+4
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Rename CiBuild as BuildTakuya Noguchi2016-07-072-4/+4
| | * | | | | Clean up coffeescript files imported from GitLab CITakuya Noguchi2016-07-074-16/+0
| * | | | | | Merge branch 'fix/import-event-error' into 'master' Robert Speicher2016-07-114-2/+41
| |\ \ \ \ \ \
| | * | | | | | fix changelog...fix/import-event-errorJames Lopez2016-07-111-5/+3
| | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-even...James Lopez2016-07-11613-4819/+13622
| | |\ \ \ \ \ \
| | * | | | | | | squashed - refactor to cope with sub sub N relations probably using the sub_r...James Lopez2016-07-114-2/+63
| * | | | | | | | Merge branch 'mr-close-btn' into 'master' Robert Speicher2016-07-112-4/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Moved merge request button visibility out of issue_helpermr-close-btnPhil Hughes2016-07-113-5/+9
| | * | | | | | | | Correctly shows close button on merge requestsPhil Hughes2016-07-041-1/+1
| * | | | | | | | | Merge branch 'fix-sent-notification-position' into 'master' Rémy Coutable2016-07-112-0/+37
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Allow SentNotification#position to be set as string or hashDouwe Maan2016-07-112-0/+37
| * | | | | | | | | | Merge branch 'single-file-diffs' into 'master' Douwe Maan2016-07-1133-486/+1100
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Handle more than two paths in MergeRequest#diffsSean McGivern2016-07-112-4/+5
| | * | | | | | | | | | Fix feature specs on CIsingle-file-diffsSean McGivern2016-07-112-22/+21
| | * | | | | | | | | | Merge branch 'master' into single-file-diffsSean McGivern2016-07-1169-388/+1123
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Support renames in diff_for_path actionsSean McGivern2016-07-1110-51/+89
| | * | | | | | | | | | | Tidy up spec action namesSean McGivern2016-07-083-14/+14
| | * | | | | | | | | | | Memoize diffs with path options set separatelySean McGivern2016-07-081-1/+2
| | * | | | | | | | | | | review changesLuke "Jared" Bennett2016-07-085-11/+9
| | * | | | | | | | | | | Make expand_all param more explicitSean McGivern2016-07-084-6/+6
| | * | | | | | | | | | | DRY up diff_for_path actionsSean McGivern2016-07-085-98/+84
| | * | | | | | | | | | | Remove unused argument to CompareService#executeSean McGivern2016-07-082-5/+11
| | * | | | | | | | | | | Fix comments on collapsed and expanded diffsSean McGivern2016-07-081-26/+23
| | * | | | | | | | | | | Allow expanding all diffs at onceSean McGivern2016-07-084-1/+45
| | * | | | | | | | | | | Ensure only renderable text diffs are collapsedSean McGivern2016-07-088-10/+166