Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add comment events to contributions calendar22645-add-discussion-contribs-to-calendar | Rémy Coutable | 2017-02-13 | 1 | -97/+125 |
* | Merge branch '27939-fix-current-build-arrow' into 'master' | Filipa Lacerda | 2017-02-13 | 1 | -0/+4 |
|\ | |||||
| * | Fix current build arrow27939-fix-current-build-arrow | Eric Eastwood | 2017-02-13 | 1 | -0/+4 |
* | | Merge branch '23535-folders-in-wiki-repository' into 'master' | Douwe Maan | 2017-02-13 | 4 | -0/+176 |
|\ \ | |||||
| * | | Add WikiPage.unhyphenize | Alex Braha Stoll | 2017-01-30 | 1 | -0/+8 |
| * | | Merge branch 'master' into 23535-folders-in-wiki-repository | Alex Braha Stoll | 2017-01-29 | 568 | -4415/+18670 |
| |\ \ | |||||
| * | | | Remove directories as one of the attributes of WikiDirectory | Alex Braha Stoll | 2016-12-31 | 1 | -12/+3 |
| * | | | Change WikiPage#directory | Alex Braha Stoll | 2016-12-31 | 1 | -3/+3 |
| * | | | Remove WikiPage#full_path | Alex Braha Stoll | 2016-12-31 | 1 | -20/+0 |
| * | | | Add a breadcrumb at projects/wikis/show.html.haml | Alex Braha Stoll | 2016-12-31 | 1 | -0/+21 |
| * | | | Add WikiDirectory#to_partial_path | Alex Braha Stoll | 2016-12-31 | 1 | -0/+8 |
| * | | | Add WikiPage#to_partial_path | Alex Braha Stoll | 2016-12-31 | 1 | -0/+8 |
| * | | | Change WikiPage.group_by_directory to use WikiDirectory | Alex Braha Stoll | 2016-12-31 | 1 | -30/+42 |
| * | | | Add model WikiDirectory | Alex Braha Stoll | 2016-12-31 | 2 | -0/+51 |
| * | | | Change WikiPage.group_by_directory to order by directory and file alphabetica... | Alex Braha Stoll | 2016-12-31 | 1 | -4/+26 |
| * | | | Change WikiPage#directory to always start a directory hierarchy with '/' | Alex Braha Stoll | 2016-12-31 | 1 | -2/+2 |
| * | | | Add component to show the full path of a wiki page when viewing its content | Alex Braha Stoll | 2016-12-31 | 1 | -0/+40 |
| * | | | 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 | 1 | -0/+17 |
* | | | | Merge branch 'dynamic-header-fixture' into 'master' | Clement Ho | 2017-02-13 | 2 | -36/+1 |
|\ \ \ \ | |||||
| * | | | | Replace static fixture for header_spec.js (!9174) | winniehell | 2017-02-13 | 2 | -36/+1 |
* | | | | | Merge branch 'new-branch-fixture' into 'master' | Clement Ho | 2017-02-13 | 3 | -6/+30 |
|\ \ \ \ \ | |||||
| * | | | | | Replace static fixture for new_branch_spec.js (!9131) | winniehell | 2017-02-11 | 3 | -6/+30 |
* | | | | | | Merge branch 'fix/cycle-analytics-events-limit' into 'master' | Sean McGivern | 2017-02-13 | 1 | -0/+45 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix spec | James Lopez | 2017-02-07 | 1 | -4/+5 |
| * | | | | | | add spec | James Lopez | 2017-02-06 | 2 | -35/+44 |
| * | | | | | | user project and not empty_project as we need the repo stuff | James Lopez | 2017-02-06 | 1 | -1/+1 |
| * | | | | | | fix typo [ci skip] | James Lopez | 2017-02-06 | 1 | -2/+2 |
| * | | | | | | Add limit to the number of events showed in cycle analytics and spec | James Lopez | 2017-02-06 | 1 | -0/+35 |
* | | | | | | | Merge branch '27886_rebasing_fix' into 'master' | Sean McGivern | 2017-02-13 | 1 | -9/+32 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Mark as WIP based on MR commits only | Jarka Kadlecova | 2017-02-13 | 1 | -9/+32 |
* | | | | | | | | Merge branch '24976-start-of-line-mention' into 'master' | Sean McGivern | 2017-02-13 | 3 | -1/+284 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Create directly_addressed Todos when mentioned in beginning of a line | Ershad Kunnakkadan | 2017-02-08 | 3 | -1/+284 |
* | | | | | | | | | Merge branch '20732_member_exists_409' into 'master' | Sean McGivern | 2017-02-13 | 2 | -2/+344 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add member: Always return 409 when a member exists | Jarka Kadlecova | 2017-02-10 | 2 | -2/+344 |
* | | | | | | | | | | Merge branch 'issue_25900_2' into 'master' | Sean McGivern | 2017-02-13 | 5 | -0/+117 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Gather issuable metadata to avoid n+ queries on index viewissue_25900_2 | Felipe Artur | 2017-02-09 | 5 | -0/+117 |
* | | | | | | | | | | | Merge branch 'fix_issue_from_milestone' into 'master' | Rémy Coutable | 2017-02-13 | 3 | -2/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fix issue creation from milestone doesn't assign the milestone | wendy0402 | 2017-02-12 | 3 | -2/+12 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'concurrent-foreign-keys' into 'master' | Rémy Coutable | 2017-02-13 | 2 | -6/+103 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Enforce use of add_concurrent_foreign_keyconcurrent-foreign-keys | Yorick Peterse | 2017-02-10 | 1 | -0/+33 |
| * | | | | | | | | | | | Add method for creating foreign keys concurrently | Yorick Peterse | 2017-02-10 | 1 | -6/+70 |
* | | | | | | | | | | | | Merge branch 'rename_files_delete_service' into 'master' | Rémy Coutable | 2017-02-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Rename Files::DeleteService to Files::DestroyService | dixpac | 2017-02-10 | 1 | -1/+1 |
* | | | | | | | | | | | | convert js-cookie dependency to an npm moduleclean-javascript-vendor-files | Mike Greiling | 2017-02-11 | 1 | -1/+1 |
* | | | | | | | | | | | | convert timeago.js dependency to an npm module | Mike Greiling | 2017-02-11 | 1 | -1/+1 |
* | | | | | | | | | | | | Fix comment button test for slash commands | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
* | | | | | | | | | | | | Fix time tracking spec | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
* | | | | | | | | | | | | Fix issue boards sidebar alignment and sidebar toggle spec | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
* | | | | | | | | | | | | Fix failing conflicts test | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |