Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'silence-webpack' into 'master' | Filipa Lacerda | 2017-02-13 | 1 | -1/+2 |
|\ | | | | | | | | | only print errors and warnings from webpack dev server See merge request !9118 | ||||
| * | only print errors and warnings from webpack dev serversilence-webpack | Simon Knox | 2017-02-11 | 1 | -1/+2 |
| | | |||||
* | | Merge branch '27939-fix-current-build-arrow' into 'master' | Filipa Lacerda | 2017-02-13 | 3 | -1/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix current build arrow Closes #27939 See merge request !9154 | ||||
| * | | Fix current build arrow27939-fix-current-build-arrow | Eric Eastwood | 2017-02-13 | 3 | -1/+9 |
| | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27939 | ||||
* | | | Merge branch '23535-folders-in-wiki-repository' into 'master' | Douwe Maan | 2017-02-13 | 18 | -14/+306 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Show directory hierarchy when listing wiki pages Closes #23535 See merge request !8133 | ||||
| * | | | Fix haml-lint violation | Alex Braha Stoll | 2017-02-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add merge request number | Alex Braha Stoll | 2017-01-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add WikiPage.unhyphenize | Alex Braha Stoll | 2017-01-30 | 3 | -2/+14 |
| | | | | |||||
| * | | | Merge branch 'master' into 23535-folders-in-wiki-repository | Alex Braha Stoll | 2017-01-29 | 1671 | -10299/+39818 |
| |\ \ \ | |||||
| * | | | | Remove directories as one of the attributes of WikiDirectory | Alex Braha Stoll | 2016-12-31 | 2 | -15/+5 |
| | | | | | |||||
| * | | | | Add new wiki related partials | Alex Braha Stoll | 2016-12-31 | 3 | -10/+9 |
| | | | | | |||||
| * | | | | Improve WikiPage.group_by_directory | Alex Braha Stoll | 2016-12-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Change WikiPage#directory | Alex Braha Stoll | 2016-12-31 | 2 | -8/+7 |
| | | | | | |||||
| * | | | | Remove WikiPage#full_path | Alex Braha Stoll | 2016-12-31 | 2 | -25/+0 |
| | | | | | |||||
| * | | | | Add a breadcrumb at projects/wikis/show.html.haml | Alex Braha Stoll | 2016-12-31 | 4 | -0/+42 |
| | | | | | |||||
| * | | | | Stop rendering page full path at projects/wikis/show.html.haml | Alex Braha Stoll | 2016-12-31 | 2 | -2/+0 |
| | | | | | |||||
| * | | | | Render wiki entries using a collection of WikiPage and WikiDirectory objects | Alex Braha Stoll | 2016-12-31 | 6 | -24/+13 |
| | | | | | |||||
| * | | | | Add WikiDirectory#to_partial_path | Alex Braha Stoll | 2016-12-31 | 2 | -0/+14 |
| | | | | | |||||
| * | | | | Add WikiPage#to_partial_path | Alex Braha Stoll | 2016-12-31 | 2 | -0/+14 |
| | | | | | |||||
| * | | | | Change WikiPage.group_by_directory to use WikiDirectory | Alex Braha Stoll | 2016-12-31 | 2 | -34/+56 |
| | | | | | |||||
| * | | | | Add model WikiDirectory | Alex Braha Stoll | 2016-12-31 | 3 | -0/+64 |
| | | | | | |||||
| * | | | | Simplify WikiPage.group_by_directory by using Enumerable#group_by | Alex Braha Stoll | 2016-12-31 | 1 | -9/+2 |
| | | | | | |||||
| * | | | | Remove WikiPage.sort_by_directory | Alex Braha Stoll | 2016-12-31 | 1 | -22/+2 |
| | | | | | |||||
| * | | | | Use the icon helper at wikis/_new.html.haml | Alex Braha Stoll | 2016-12-31 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix scss style violation | Alex Braha Stoll | 2016-12-31 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Improve style of wiki page lists | Alex Braha Stoll | 2016-12-31 | 2 | -1/+17 |
| | | | | | |||||
| * | | | | Change WikiPage.group_by_directory to order by directory and file ↵ | Alex Braha Stoll | 2016-12-31 | 2 | -5/+54 |
| | | | | | | | | | | | | | | | | | | | | alphabetical order | ||||
| * | | | | Add tip about specifying the full path when creating new wiki pages | Alex Braha Stoll | 2016-12-31 | 2 | -0/+12 |
| | | | | | |||||
| * | | | | Change WikiPage#directory to always start a directory hierarchy with '/' | Alex Braha Stoll | 2016-12-31 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | Change WikiPage.group_by_directory to use WikiPage#directory | Alex Braha Stoll | 2016-12-31 | 1 | -4/+2 |
| | | | | | |||||
| * | | | | Add component to show the full path of a wiki page when viewing its content | Alex Braha Stoll | 2016-12-31 | 4 | -2/+54 |
| | | | | | |||||
| * | | | | Remove root directory name from index of wikis | Alex Braha Stoll | 2016-12-31 | 2 | -9/+14 |
| | | | | | |||||
| * | | | | Remove root directory name from the sidebar of wikis | Alex Braha Stoll | 2016-12-31 | 2 | -7/+13 |
| | | | | | |||||
| * | | | | Remove WikiPage.add_to_directory | Alex Braha Stoll | 2016-12-31 | 1 | -8/+0 |
| | | | | | |||||
| * | | | | Refactor WikiPage.group_by_directory | Alex Braha Stoll | 2016-12-31 | 1 | -9/+6 |
| | | | | | |||||
| * | | | | Add specs for WikiPage.group_by_directory | Alex Braha Stoll | 2016-12-31 | 1 | -6/+24 |
| | | | | | |||||
| * | | | | Show directory hierarchy when listing wiki pages | Alex Braha Stoll | 2016-12-31 | 6 | -10/+65 |
| | | | | | |||||
* | | | | | Merge branch 'dynamic-header-fixture' into 'master' | Clement Ho | 2017-02-13 | 3 | -36/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for header_spec.js See merge request !9174 | ||||
| * | | | | | Replace static fixture for header_spec.js (!9174) | winniehell | 2017-02-13 | 3 | -36/+5 |
| | | | | | | |||||
* | | | | | | Merge branch 'new-branch-fixture' into 'master' | Clement Ho | 2017-02-13 | 4 | -6/+34 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for new_branch_spec.js See merge request !9131 | ||||
| * | | | | | | Replace static fixture for new_branch_spec.js (!9131) | winniehell | 2017-02-11 | 4 | -6/+34 |
| | | | | | | | |||||
* | | | | | | | Merge branch '28032-tooltips-file-name' into 'master' | Annabel Dunstone Gray | 2017-02-13 | 2 | -3/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds container to tooltip in order to make it work with overflow:hidden in parent element Closes #28032 See merge request !9170 | ||||
| * | | | | | | | Adds container to tooltip in order to make it work with overflow:hidden in ↵28032-tooltips-file-name | Filipa Lacerda | 2017-02-12 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parent element | ||||
* | | | | | | | | Merge branch '28034-icon-in-issue-search-dropdown-still-animates' into 'master' | Annabel Dunstone Gray | 2017-02-13 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Icon in issue search dropdown still animates" Closes #28034 See merge request !9156 | ||||
| * | | | | | | | | Disable animation on avatars inside filter dropdowns28034-icon-in-issue-search-dropdown-still-animates | Alfredo Sumaran | 2017-02-10 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove animation for icons on filter dropdown | Alfredo Sumaran | 2017-02-10 | 1 | -2/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch ↵ | Annabel Dunstone Gray | 2017-02-13 | 2 | -2/+10 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '27947-missing-margin-between-loading-icon-and-text-in-merge-request-widget' into 'master' Resolve "Missing margin between loading icon and text in Merge Request Widget" Closes #27947 See merge request !9119 | ||||
| * | | | | | | | | Add margin to loading icon in Merge Request Widget27947-missing-margin-between-loading-icon-and-text-in-merge-request-widget | Sam Rose | 2017-02-10 | 2 | -2/+10 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'fix/cycle-analytics-events-limit' into 'master' | Sean McGivern | 2017-02-13 | 5 | -2/+63 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add limit to the number of events showed in cycle analytics See merge request !7743 | ||||
| * | | | | | | | | Fix display logic for warning messagefix/cycle-analytics-events-limit | Sam Rose | 2017-02-08 | 2 | -4/+4 |
| | | | | | | | | |