summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix rubocop offensesfix/30961Douglas Barbosa Alexandre2017-04-171-1/+1
* Does not remove the GitHub remote when importing from GitHubDouglas Barbosa Alexandre2017-04-173-2/+9
* Merge branch 'clean-merge_request-diff-notes-specs' into 'master' Robert Speicher2017-04-175-523/+470
|\
| * Reorganize feature specs for MR notesclean-merge_request-diff-notes-specsRémy Coutable2017-04-145-523/+470
* | Merge branch 'title-positioning-updates' into 'master' Jacob Schatz2017-04-171-2/+2
|\ \
| * | Fix spacing of nav headertitle-positioning-updatesAnnabel Dunstone Gray2017-04-141-2/+2
* | | Merge branch '28575-expand-collapse-look' into 'master' Annabel Dunstone Gray2017-04-173-1/+11
|\ \ \
| * | | Expand/collapse button -> Change to make it look like a toggleJacopo2017-04-163-1/+11
* | | | Merge branch '30863-fix-award-button-smiley-jumping-out-of-place' into 'master' Fatih Acet2017-04-171-1/+5
|\ \ \ \
| * | | | Fix award button smiley jumping out of place30863-fix-award-button-smiley-jumping-out-of-placeEric Eastwood2017-04-121-1/+5
* | | | | Merge branch 'fix/github-doc-link' into 'master' Marcia Ramos2017-04-171-0/+6
|\ \ \ \ \
| * | | | | Add link to GitHub rake taskJames Lopez2017-04-171-0/+6
|/ / / / /
* | | | | Merge branch 'move-search-labels' into 'master' Clement Ho2017-04-173-8/+10
|\ \ \ \ \
| * | | | | Move labels of search results from bottom to title (!10705)winniehell2017-04-143-8/+10
* | | | | | Merge branch 'fix-follow-with-multiple-paths' into 'master' Douwe Maan2017-04-172-1/+22
|\ \ \ \ \ \
| * | | | | | Fix following with multiple pathsfix-follow-with-multiple-pathsSean McGivern2017-04-172-1/+22
* | | | | | | Merge branch 'dz-remove-repo-version' into 'master' Douwe Maan2017-04-174-14/+5
|\ \ \ \ \ \ \
| * | | | | | | Removes `Repository#version` method and testsdz-remove-repo-versionDmitriy Zaporozhets2017-04-174-14/+5
| |/ / / / / /
* | | | | | | Merge branch 'fix/project-visibility-setting' into 'master' Douwe Maan2017-04-173-5/+41
|\ \ \ \ \ \ \
| * | | | | | | Fix restricted visibility project settingJames Lopez2017-04-173-5/+41
|/ / / / / / /
* | | | | | | Merge branch '30986-diff-text-overflowing' into 'master' Annabel Dunstone Gray2017-04-171-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Added break-word wrap30986-diff-text-overflowingLuke "Jared" Bennett2017-04-171-0/+4
| |/ / / / / /
* | | | | | | Merge branch 'sh-add-option-to-hard-delete' into 'master' Douwe Maan2017-04-174-3/+10
|\ \ \ \ \ \ \
| * | | | | | | Hard delete users' associated records deleted from AbuseReportssh-add-option-to-hard-deleteStan Hu2017-04-164-3/+10
* | | | | | | | Merge branch 'fix-trace-encoding' into 'master' Sean McGivern2017-04-173-4/+31
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Set the encoding in c'tor and explain why it's finefix-trace-encodingLin Jen-Shin2017-04-172-9/+9
| * | | | | | | Add changelog entryLin Jen-Shin2017-04-171-0/+4
| * | | | | | | Restore nil for streamLin Jen-Shin2017-04-171-1/+1
| * | | | | | | Only set the encoding before passing to Ansi2htmlLin Jen-Shin2017-04-173-12/+15
| * | | | | | | Don't try to read if there's no traceLin Jen-Shin2017-04-171-0/+2
| * | | | | | | Make sure @stream.each_line would tag Encoding.default_externalLin Jen-Shin2017-04-172-4/+16
| * | | | | | | Make sure we're giving Encoding.default_externalLin Jen-Shin2017-04-172-5/+11
|/ / / / / / /
* | | | | | | Merge branch '27655-clear-emoji-search-after-selection' into 'master' Alfredo Sumaran2017-04-174-24/+67
|\ \ \ \ \ \ \
| * | | | | | | Clear emoji search in awards menu after picking emoji27655-clear-emoji-search-after-selectionEric Eastwood2017-04-134-24/+67
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sh-fix-base-parser' into 'master' Robert Speicher2017-04-162-3/+23
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix regression in rendering Markdown references that do not existsh-fix-base-parserStan Hu2017-04-152-3/+23
| | |/ / / / | |/| | | |
* | | | | | Merge branch '30492-using-icon-to-mark-discussion-as-resolved-does-not-resolv...Phil Hughes2017-04-151-4/+4
|\ \ \ \ \ \
| * | | | | | Update ResolveBtn when CommentStore changes state30492-using-icon-to-mark-discussion-as-resolved-does-not-resolve-discussionSam Rose2017-04-131-4/+4
* | | | | | | Merge branch 'issue-title-vue-sfc' into 'master' Phil Hughes2017-04-155-25/+24
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Issue Title Vue: convert to .vue - use 'render' with 'createElement' in indexRegis Boudinot2017-04-155-25/+24
|/ / / / / /
* | | | | | Merge branch 'sh-disable-cache-classes' into 'master' Robert Speicher2017-04-142-1/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Turn on caching of classes in Knapsack specsStan Hu2017-04-142-1/+8
|/ / / / /
* | | | | Merge branch '30810-fix-note-header-info-and-action-overlap' into 'master' Annabel Dunstone Gray2017-04-142-18/+35
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix note header timeago and action overlap30810-fix-note-header-info-and-action-overlapEric Eastwood2017-04-132-18/+35
* | | | | Merge branch 'remove-double-newline-for-single-attachments' into 'master' Phil Hughes2017-04-143-5/+13
|\ \ \ \ \
| * | | | | Only add newlines for multiple uploadsremove-double-newline-for-single-attachmentsLuke "Jared" Bennett2017-04-143-5/+13
* | | | | | Merge branch 'add-cookie-expirations-to-callouts' into 'master' Phil Hughes2017-04-142-2/+2
|\ \ \ \ \ \
| * | | | | | Add expirations to CA and user calloutsLuke "Jared" Bennett2017-04-142-2/+2
| |/ / / / /
* | | | | | Merge branch 'frontend_prevent_authored_awardable_votes' into 'master' Alfredo Sumaran2017-04-148-12/+100
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | frontend prevent authored votesbarthc2017-04-148-12/+100