Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update textarea height and refocus when attaching files30008-textarea-focus | Simon Knox | 2017-04-18 | 2 | -4/+11 |
| | | | | also fix extra newline when pasting image into textarea | ||||
* | Merge branch 'dm-git-blob-sizes' into 'master' | Robert Speicher | 2017-04-18 | 2 | -4/+4 |
|\ | | | | | | | | | Normalize sizes in Gitlab::Git::Blob See merge request !10742 | ||||
| * | Fix specsdm-git-blob-sizes | Douwe Maan | 2017-04-17 | 1 | -2/+2 |
| | | |||||
| * | Normalize sizes in Gitlab::Git::Blob | Douwe Maan | 2017-04-17 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'dm-no-format-suffix' into 'master' | Robert Speicher | 2017-04-18 | 3 | -102/+71 |
|\ \ | | | | | | | | | | | | | Remove format from end of URL for URLs that take a ref or path See merge request !10740 | ||||
| * | | Remove format from end of URL for URLs that take a ref or path | Douwe Maan | 2017-04-17 | 3 | -102/+71 |
| |/ | |||||
* | | Merge branch 'fix/30961' into 'master' | Robert Speicher | 2017-04-18 | 3 | -2/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | Does not remove the GitHub remote when importing from GitHub Closes #30961 See merge request !10750 | ||||
| * | | Does not remove the GitHub remote when importing from GitHub | Douglas Barbosa Alexandre | 2017-04-18 | 3 | -2/+9 |
|/ / | |||||
* | | Merge branch 'dm-diff-too-large-error' into 'master' | Robert Speicher | 2017-04-18 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Rephrase error message for a diff with a blob that’s too large See merge request !10746 | ||||
| * | | Rephrase error message for a diff with a blob that’s too largedm-diff-too-large-error | Douwe Maan | 2017-04-17 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'dm-can-modify-blob' into 'master' | Robert Speicher | 2017-04-17 | 2 | -4/+4 |
|\ \ | | | | | | | | | | | | | Rename can_edit_blob? to can_modify_blob? See merge request !10748 | ||||
| * | | Rename can_edit_blob? to can_modify_blob?dm-can-modify-blob | Douwe Maan | 2017-04-17 | 2 | -4/+4 |
| |/ | |||||
* | | Merge branch 'dm-fix-snippet-search' into 'master' | Robert Speicher | 2017-04-17 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Show case insensitive matches in snippet search results See merge request !10745 | ||||
| * | | Show case insensitive matches in snippet search resultsdm-fix-snippet-search | Douwe Maan | 2017-04-17 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'dm-snippet-page-title' into 'master' | Robert Speicher | 2017-04-17 | 4 | -4/+4 |
|\ \ | | | | | | | | | | | | | Add snippet IID to snippet page titles See merge request !10744 | ||||
| * | | Add snippet IID to snippet page titlesdm-snippet-page-title | Douwe Maan | 2017-04-17 | 4 | -4/+4 |
| |/ | |||||
* | | Merge branch 'variable-table-styles' into 'master' 29224-incorrect-loading-of-no_avatar | Annabel Dunstone Gray | 2017-04-17 | 2 | -17/+13 |
|\ \ | | | | | | | | | | | | | | | | | | | Used fixed widths and ellipsis for variable table styles Closes #25780 See merge request !10739 | ||||
| * \ | Merge branch 'variable-table-styles' of gitlab.com:gitlab-org/gitlab-ce into ↵variable-table-styles | Bryce Johnson | 2017-04-17 | 0 | -0/+0 |
| |\ \ | | | | | | | | | | | | | variable-table-styles | ||||
| | * | | Fix comment length and syntax. | Bryce Johnson | 2017-04-17 | 1 | -4/+3 |
| | | | | |||||
| * | | | Remove unneeded min-width. | Bryce Johnson | 2017-04-17 | 1 | -6/+1 |
| |/ / | |||||
| * | | Use ellipsis and nowrap. | Bryce Johnson | 2017-04-17 | 1 | -6/+10 |
| | | | |||||
| * | | Remove breakpoints, use fixed widths. | Bryce Johnson | 2017-04-17 | 1 | -13/+6 |
| | | | |||||
| * | | Update variable table styles at wider viewport. | Bryce Johnson | 2017-04-17 | 2 | -3/+7 |
| | | | |||||
* | | | Merge branch 'clean-merge_request-diff-notes-specs' into 'master' | Robert Speicher | 2017-04-17 | 5 | -523/+470 |
|\ \ \ | | | | | | | | | | | | | | | | | Reorganize feature specs for MR notes See merge request !10661 | ||||
| * | | | Reorganize feature specs for MR notesclean-merge_request-diff-notes-specs | Rémy Coutable | 2017-04-14 | 5 | -523/+470 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Merge branch 'title-positioning-updates' into 'master' | Jacob Schatz | 2017-04-17 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix spacing of nav title See merge request !10708 | ||||
| * | | | | Fix spacing of nav headertitle-positioning-updates | Annabel Dunstone Gray | 2017-04-14 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch '28575-expand-collapse-look' into 'master' | Annabel Dunstone Gray | 2017-04-17 | 3 | -1/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand/collapse button -> Change to make it look like a toggle Closes #28575 See merge request !10720 | ||||
| * | | | | | Expand/collapse button -> Change to make it look like a toggle | Jacopo | 2017-04-16 | 3 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the expand/collapse button to look different when is opened/closed | ||||
* | | | | | | Merge branch '30863-fix-award-button-smiley-jumping-out-of-place' into 'master' | Fatih Acet | 2017-04-17 | 1 | -1/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix award button smiley jumping out of place Closes #30863 See merge request !10672 | ||||
| * | | | | | | Fix award button smiley jumping out of place30863-fix-award-button-smiley-jumping-out-of-place | Eric Eastwood | 2017-04-12 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30863 | ||||
* | | | | | | | Merge branch 'fix/github-doc-link' into 'master' | Marcia Ramos | 2017-04-17 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to GitHub rake task Closes #30730 See merge request !10616 | ||||
| * | | | | | | | Add link to GitHub rake task | James Lopez | 2017-04-17 | 1 | -0/+6 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'move-search-labels' into 'master' | Clement Ho | 2017-04-17 | 3 | -8/+10 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move labels of search results from bottom to title Closes #19897 See merge request !10705 | ||||
| * | | | | | | Move labels of search results from bottom to title (!10705) | winniehell | 2017-04-14 | 3 | -8/+10 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'fix-follow-with-multiple-paths' into 'master' | Douwe Maan | 2017-04-17 | 2 | -1/+22 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix following with multiple paths Closes gitlab-ee#2175 See merge request !10737 | ||||
| * | | | | | | | Fix following with multiple pathsfix-follow-with-multiple-paths | Sean McGivern | 2017-04-17 | 2 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `git log --follow` is only supported for a single path. CE doesn't currently pass multiple paths, but EE does. | ||||
* | | | | | | | | Merge branch 'dz-remove-repo-version' into 'master' | Douwe Maan | 2017-04-17 | 4 | -14/+5 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `Repository#version` method and tests Closes #24251 See merge request !10734 | ||||
| * | | | | | | | | Removes `Repository#version` method and testsdz-remove-repo-version | Dmitriy Zaporozhets | 2017-04-17 | 4 | -14/+5 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | | Merge branch 'fix/project-visibility-setting' into 'master' | Douwe Maan | 2017-04-17 | 3 | -5/+41 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix restricted visibility project setting Closes #30581 See merge request !10622 | ||||
| * | | | | | | | | Fix restricted visibility project setting | James Lopez | 2017-04-17 | 3 | -5/+41 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch '30986-diff-text-overflowing' into 'master' | Annabel Dunstone Gray | 2017-04-17 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added break-word wrap Closes #30986 See merge request !10733 | ||||
| * | | | | | | | | Added break-word wrap30986-diff-text-overflowing | Luke "Jared" Bennett | 2017-04-17 | 1 | -0/+4 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'sh-add-option-to-hard-delete' into 'master' | Douwe Maan | 2017-04-17 | 4 | -3/+10 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hard delete users' associated records deleted from AbuseReports Closes #31021 See merge request !10723 | ||||
| * | | | | | | | | Hard delete users' associated records deleted from AbuseReportssh-add-option-to-hard-delete | Stan Hu | 2017-04-16 | 4 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of spammers, we really want a hard delete to avoid retaining spam. Closes #31021 | ||||
* | | | | | | | | | Merge branch 'fix-trace-encoding' into 'master' | Sean McGivern | 2017-04-17 | 3 | -4/+31 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly give Encoding.default_external for trace Closes #30796 See merge request !10728 | ||||
| * | | | | | | | | Set the encoding in c'tor and explain why it's finefix-trace-encoding | Lin Jen-Shin | 2017-04-17 | 2 | -9/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Add changelog entry | Lin Jen-Shin | 2017-04-17 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Restore nil for stream | Lin Jen-Shin | 2017-04-17 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Only set the encoding before passing to Ansi2html | Lin Jen-Shin | 2017-04-17 | 3 | -12/+15 |
| | | | | | | | | |