| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into notebooklab-in-reponotebooklab-in-repo | Phil Hughes | 2017-04-13 | 61 | -2015/+2137 |
| |\ | |||||
| | * | Merge branch 'fix-appending-state-to-issuable-references' into 'master' | Robert Speicher | 2017-04-13 | 2 | -13/+34 |
| | |\ | | | | | | | | | | | | | | | | | | | Fix appending state to issuable references Closes #30874 See merge request !10683 | ||||
| | | * | Fix appending state to issuable referencesfix-appending-state-to-issuable-references | Adam Niedzielski | 2017-04-13 | 2 | -13/+34 |
| | | | | | | | | | | | | | | | | | | | | | | Closes #30874. Ignore nodes with no children. Append directly to the node instead of the last child of the node to avoid inheriting formatting from the last child | ||||
| | * | | Merge branch 'fix-trace-seeking-readline' into 'master' | Kamil Trzciński | 2017-04-13 | 5 | -10/+41 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | After Trace#limit, we seek to the next line in case Closes #30796 See merge request !10681 | ||||
| | | * | | Update tests for the fact that we would skip one linefix-trace-seeking-readline | Lin Jen-Shin | 2017-04-13 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | Don't seek at all if the log is small anyway | Lin Jen-Shin | 2017-04-13 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | then it's fine to skip the first line because it won't be very noticeable | ||||
| | | * | | Add changelog entry | Lin Jen-Shin | 2017-04-13 | 1 | -0/+4 |
| | | | | | |||||
| | | * | | After Trace#limit, we seek to the next line in case | Lin Jen-Shin | 2017-04-13 | 4 | -3/+32 |
| | | | | | | | | | | | | | | | | | of breaking ANSI sequence or Unicode | ||||
| | * | | | Merge branch 'empty-task-list-alignment' into 'master' jej/master-greenjej-master-green | Annabel Dunstone Gray | 2017-04-13 | 2 | -0/+5 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed alignment of empty task list items Closes #29913 See merge request !10480 | ||||
| | | * | | | Fixed alignment of empty task list itemsempty-task-list-alignment | Phil Hughes | 2017-04-11 | 2 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | Closes #29913 | ||||
| | * | | | | Merge branch 'notebook-katex-rendering-improvements' into 'master' | Jacob Schatz | 2017-04-13 | 1 | -15/+44 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly parse katex math in IPyhton notebooks Closes #30900 See merge request !10678 | ||||
| | | * | | | | Correctly parse katex math in IPyhton notebooksnotebook-katex-rendering-improvements | Phil Hughes | 2017-04-13 | 1 | -15/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously only some of the math was getting parsed. This makes it so that different math options are possible & correctly parsed Also fixes an issue that meant HTML was being outputted that could cause an XSS Closes #30900 | ||||
| | * | | | | | Merge branch 'fix/gb/fix-registry-for-uppercased-project-paths' into 'master' | Kamil Trzciński | 2017-04-13 | 4 | -8/+35 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix registry for projects with uppercases in path Closes #30880 See merge request !10674 | ||||
| | | * | | | | | Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-paths | Grzegorz Bizon | 2017-04-13 | 3 | -5/+16 |
| | | | | | | | | |||||
| | | * | | | | | Fix registry for projects with uppercases in path | Grzegorz Bizon | 2017-04-13 | 2 | -4/+20 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch '30622-resolve-note-loading-icon-gone' into 'master' | Filipa Lacerda | 2017-04-13 | 3 | -4/+9 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Resolve note loading icon gone" Closes #30622 See merge request !10628 | ||||
| | | * | | | | | | Review changes30622-resolve-note-loading-icon-gone | Luke "Jared" Bennett | 2017-04-12 | 1 | -0/+5 |
| | | | | | | | | | |||||
| | | * | | | | | | Fix resolve spinner and add test | Luke "Jared" Bennett | 2017-04-11 | 3 | -4/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch '30188-handle-remove-branch-failure' into 'master' | Filipa Lacerda | 2017-04-13 | 3 | -5/+58 |
| | |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix js error in MR remove branch failure handler Closes #30188 See merge request !10304 | ||||
| | | * | | | | | | tests for success and failure of deleting branch from MR page30188-handle-remove-branch-failure | Simon Knox | 2017-04-13 | 3 | -1/+54 |
| | | | | | | | | | |||||
| | | * | | | | | | fix js error in MR remove branch failure handler | Simon Knox | 2017-04-12 | 1 | -4/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'remove-iife-cycle-analytics-bundle' into 'master' 26510-should-project-updated-time-actually-be-the-last-activity-time | Filipa Lacerda | 2017-04-13 | 12 | -697/+682 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove IIFEs from files in cycle_analytics_bundle.js See merge request !10613 | ||||
| | | * | | | | | | | Remove IIFEs from files in cycle_analytics_bundle.jsremove-iife-cycle-analytics-bundle | Alfredo Sumaran | 2017-04-10 | 12 | -697/+682 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'remove-iife-boards-bundle' into 'master' | Filipa Lacerda | 2017-04-13 | 18 | -1269/+1232 |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove IIFEs in boards_bundle.js See merge request !10612 | ||||
| | | * | | | | | | | Remove IIFEs in boards_bundle.jsremove-iife-boards-bundle | Alfredo Sumaran | 2017-04-10 | 18 | -1269/+1232 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch '30779-show-mr-subnav-issue-tracker' into 'master' | Alfredo Sumaran | 2017-04-13 | 12 | -9/+41 |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show sub-nav under Merge Requests when issue tracker is non-default Closes #30779 See merge request !10658 | ||||
| | | * | | | | | | | Show sub-nav under Merge Requests when issue tracker is non-default | Kushal Pandya | 2017-04-13 | 12 | -9/+41 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Revert "Fix registry for projects with uppercases in path" | Grzegorz Bizon | 2017-04-13 | 2 | -20/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 22726942fe0b6c11c20de070cc9784de12ca2ce6. | ||||
| | * | | | | | | | Fix registry for projects with uppercases in path | Grzegorz Bizon | 2017-04-13 | 2 | -4/+20 |
| | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | | Pulled in latest changes | Phil Hughes | 2017-04-13 | 1 | -14/+59 |
| | | | | | | | | |||||
| * | | | | | | | Pulled in latest changes from NotebookLab | Phil Hughes | 2017-04-13 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into notebooklab-in-repo | Phil Hughes | 2017-04-13 | 162 | -1219/+3343 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge branch '30642-fix-recent-search-history-icon-alignment-in-safari' into ↵ | Clement Ho | 2017-04-13 | 1 | -14/+12 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix recent searches icon alignment in Safari Closes #30642 See merge request !10606 | ||||
| | | * | | | | | | Fix recent searches icon alignment in Safari30642-fix-recent-search-history-icon-alignment-in-safari | Eric Eastwood | 2017-04-12 | 1 | -14/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30642 | ||||
| | * | | | | | | | Merge branch ↵ | Sean McGivern | 2017-04-12 | 2 | -7/+11 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'omnibus-gitlab-1993-check-shell-repositories-path-group-is-root' into 'master' Fix the `gitlab:gitlab_shell:check` task Closes omnibus-gitlab#1993 See merge request !10645 | ||||
| | | * | | | | | | | Fix the `gitlab:gitlab_shell:check` taskomnibus-gitlab-1993-check-shell-repositories-path-group-is-root | Rémy Coutable | 2017-04-12 | 2 | -7/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the `gitlab:gitlab_shell:check` task check that the repositories storage path are owned by the `root` group Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | Merge branch 'rs-fix-already-defined-constant' into 'master' | Douwe Maan | 2017-04-12 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error See merge request !10664 | ||||
| | | * | | | | | | | | Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition errorrs-fix-already-defined-constant | Robert Speicher | 2017-04-12 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'use-avatars-in-activity-view' into 'master' | Douwe Maan | 2017-04-12 | 7 | -27/+46 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use avatars instead of icons in activity view See merge request !10596 | ||||
| | | * | | | | | | | | | Move event icons into events_helperuse-avatars-in-activity-view | Annabel Dunstone Gray | 2017-04-12 | 3 | -21/+31 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Add helper for using avatars vs icons | Annabel Dunstone Gray | 2017-04-11 | 6 | -27/+19 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Reuse system notes helper for profile event icons | Annabel Dunstone Gray | 2017-04-11 | 7 | -25/+20 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Only show icons on profile page; change to case statement | Annabel Dunstone Gray | 2017-04-11 | 4 | -18/+21 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Use avatars instead of icons in activity view | Annabel Dunstone Gray | 2017-04-10 | 5 | -24/+43 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch '22714-update-all-instances-of-fa-refresh' into 'master' | Alfredo Sumaran | 2017-04-12 | 7 | -8/+12 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update all instances of "fa-refresh" to "fa-spinner" Closes #22714 See merge request !10490 | ||||
| | | * | | | | | | | | | | Update all instances of "fa-refresh" to "fa-spinner" | Andrew Torres | 2017-04-11 | 7 | -8/+12 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch '30858-system-notes-indent' into 'master' | Jacob Schatz | 2017-04-12 | 1 | -4/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Indent system notes on desktop screens Closes #30858 See merge request !10667 | ||||
| | | * | | | | | | | | | | | Indent system notes on desktop screens | Annabel Dunstone Gray | 2017-04-12 | 1 | -4/+12 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'fix-pdflab-paths' into 'master' | Jacob Schatz | 2017-04-12 | 2 | -156/+171 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pdflab code including file paths See merge request !10632 | ||||
| | | * | | | | | | | | | | | | Fix pdflab code including file pathsfix-pdflab-paths | Sam Rose | 2017-04-11 | 2 | -156/+171 |
| | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |