Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix user activities API version in docsfix-user-activity-api | Sean McGivern | 2017-04-20 | 1 | -1/+1 |
| | |||||
* | Merge branch 'uassign_on_member_removing' into 'master' | Sean McGivern | 2017-04-20 | 11 | -29/+96 |
|\ | | | | | | | | | | | | | Unassign all Issues and Merge Requests when member leaves a team Closes #30768 and #24117 See merge request !10755 | ||||
| * | Remove helpers assigned_issuables_count and cached_assigned_issuables_countuassign_on_member_removing | Valery Sizov | 2017-04-20 | 9 | -27/+25 |
| | | |||||
| * | Remove assigned_(issues|merge_requests) methods from the issuable | Valery Sizov | 2017-04-18 | 4 | -10/+4 |
| | | |||||
| * | Using IssuablesFinder(s) for UI counters | Valery Sizov | 2017-04-18 | 1 | -1/+2 |
| | | |||||
| * | Update permission docs. Add note about automatic unassigning when member ↵ | Valery Sizov | 2017-04-18 | 1 | -0/+3 |
| | | | | | | | | leaves a team | ||||
| * | update chnagelog | Valery Sizov | 2017-04-18 | 1 | -0/+4 |
| | | |||||
| * | Unassign all Issues and Merge Requests when member leaves team | Valery Sizov | 2017-04-18 | 2 | -1/+68 |
| | | |||||
* | | Merge branch '31154-fix-plantuml-link-in-documentation' into 'master' | Sean McGivern | 2017-04-20 | 1 | -1/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | Update plantuml.md to fix wrong introduced in link. Closes #31154 See merge request !10806 | ||||
| * | | Update plantuml.md to add the actual link. | Sascha Reynolds | 2017-04-20 | 1 | -0/+2 |
| | | | |||||
| * | | Update plantuml.md to fix wrong introduced in link. | Sascha Reynolds | 2017-04-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'rollback-component-vue' into 'master' | Phil Hughes | 2017-04-20 | 6 | -50/+58 |
|\ \ \ | | | | | | | | | | | | | | | | | Refactor into .vue files See merge request !10788 | ||||
| * | | | Refactor into .vue files | Filipa Lacerda | 2017-04-20 | 6 | -50/+58 |
|/ / / | |||||
* | | | Merge branch 'user-cohort-better-doc' into 'master' | Sean McGivern | 2017-04-20 | 1 | -7/+14 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for inactive users in the User cohort Closes #31195 See merge request !10809 | ||||
| * | | | Fixed wordinguser-cohort-better-doc | Regis Freyd | 2017-04-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix headings | Regis Freyd | 2017-04-20 | 1 | -3/+6 |
| | | | | |||||
| * | | | Add more information in the User cohort documentation | Regis Freyd | 2017-04-20 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | We needed to clarify what inactive users are. | ||||
* | | | | Merge branch 'steps-to-MR' into 'master' | Jacob Schatz | 2017-04-20 | 6 | -16/+408 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds vue js example application and documentation Closes #30031 and #30030 See merge request !10693 | ||||
| * | | | | Adds vue js example application and documentation | Filipa Lacerda | 2017-04-20 | 6 | -16/+408 |
|/ / / / | |||||
* | | | | Merge branch '27486-eslint-promises' into 'master' | Filipa Lacerda | 2017-04-20 | 21 | -23/+73 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add ES lint support to identify poorly written Promises See merge request !9969 | ||||
| * | | | | Add ES lint support to identify poorly written Promises | Kushal Pandya | 2017-04-20 | 21 | -23/+73 |
|/ / / / | |||||
* | | | | Merge branch 'fix/29125' into 'master' | Sean McGivern | 2017-04-20 | 5 | -1/+40 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of fix/29125-ee to CE Closes #29125 See merge request !10796 | ||||
| * | | | | Add CHANGELOGfix/29125 | Douglas Barbosa Alexandre | 2017-04-19 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Port of fix/29125-ee to CE | Douglas Barbosa Alexandre | 2017-04-19 | 4 | -1/+36 |
| | | | | | |||||
* | | | | | Merge branch 'issuable-state-custom-links' into 'master' | Sean McGivern | 2017-04-20 | 2 | -34/+78 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not append issuable state to links with custom anchor Closes #30916 See merge request !10782 | ||||
| * | | | | | Do not append issuable state to links with custom anchorissuable-state-custom-links | Adam Niedzielski | 2017-04-19 | 2 | -34/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #30916 Change the presentation from [closed] to (closed) | ||||
* | | | | | | Merge branch 'environments-vue-2' into 'master' | Phil Hughes | 2017-04-20 | 8 | -59/+71 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Refactor into .vue files part 2 See merge request !10791 | ||||
| * | | | | | Refactor into .vue files part 2 | Filipa Lacerda | 2017-04-20 | 8 | -59/+71 |
|/ / / / / | |||||
* | | | | | Merge branch 'plantuml-filter-after-highlight' into 'master' | Sean McGivern | 2017-04-20 | 3 | -8/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix PlantUML integration in GFM Closes #30557 See merge request !10651 | ||||
| * | | | | | Fix PlantUML integration in GFMplantuml-filter-after-highlight | Adam Niedzielski | 2017-04-19 | 3 | -8/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #30557 Use "lang" attribute instead of "class" in PlantumlFilter. | ||||
* | | | | | | Merge branch 'dm-markup-helper-constants' into 'master' | Robert Speicher | 2017-04-20 | 1 | -9/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use constants in Gitlab::MarkupHelper See merge request !10741 | ||||
| * | | | | | | Use constants in Gitlab::MarkupHelper | Douwe Maan | 2017-04-20 | 1 | -9/+16 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'dm-fix-editing-files-on-forks' into 'master' | Robert Speicher | 2017-04-20 | 47 | -459/+274 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor changing files in web UI Closes #28711 See merge request !9323 | ||||
| * | | | | | | Refactor changing files in web UI | Douwe Maan | 2017-04-20 | 47 | -459/+274 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'hook_retries' into 'master' | Douwe Maan | 2017-04-19 | 2 | -0/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add retries to system hook worker Closes #31109 See merge request !10801 | ||||
| * | | | | | | Add retry to system hook worker | Drew Blessing | 2017-04-19 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default number of Sidekiq retries is 25 over about 21 days. If an external system is unavailable for a length of time, hooks can pile up in the Sidekiq queues. If the situation gets bad enough the retry jobs dropping back into the main queue can slow down other jobs. Limit the retries to a sane number to avoid this scenario. | ||||
* | | | | | | | Merge branch 'sh-issue-29247-fix' into 'master' | Douwe Maan | 2017-04-19 | 4 | -0/+33 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't delete a branch involved in an open merge request in "Delete all merged branches" service Closes #29427 See merge request !10727 | ||||
| * | | | | | | | Don't delete a branch involved in an open merge request in "Delete all ↵sh-issue-29247-fix | Stan Hu | 2017-04-19 | 4 | -0/+33 |
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merged branches" service Customers were surprised by the previous behavior, which destroyed branches even though an open merge request existed for it. Closes #29427 | ||||
* | | | | | | | Merge branch ↵ | Alfredo Sumaran | 2017-04-19 | 7 | -6/+47 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '30951-start-discussion-toggle-clicking-divider-causes-ui-break' into 'master' Resolve "start discussion toggle clicking divider causes UI break" Closes #30951 See merge request !10715 | ||||
| * | | | | | | | Resolve "start discussion toggle clicking divider causes UI break" | Luke "Jared" Bennett | 2017-04-19 | 7 | -6/+47 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'sh-add-index-to-system-note-metadata' into 'master' | Sean McGivern | 2017-04-19 | 3 | -1/+24 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | Add unique index to system note metadata See merge request !10774 | ||||
| * | | | | | | Add unique index for note_id to system note metadata tablesh-add-index-to-system-note-metadata | Stan Hu | 2017-04-19 | 3 | -1/+24 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | In issue 1, the sequential scan was taking 250+ ms. | ||||
* | | | | | | Merge branch 'query-users-by-extern-uid' into 'master' | Robert Speicher | 2017-04-19 | 5 | -8/+59 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement search by extern_uid in Users API See merge request !10509 | ||||
| * | | | | | | Implement search by extern_uid in Users API | Robin Bobbitt | 2017-04-18 | 5 | -8/+59 |
| | | | | | | | |||||
* | | | | | | | Merge branch '29977-style-comments-and-system-notes-real-time-updates' into ↵ | Clement Ho | 2017-04-19 | 8 | -32/+196 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add renderNote animation and added spec Closes #29977 See merge request !10623 | ||||
| * | | | | | | | Add renderNote animation and added spec | Luke "Jared" Bennett | 2017-04-19 | 8 | -32/+196 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'right-sidebar-closed-default-mobile' into 'master' | Alfredo Sumaran | 2017-04-19 | 4 | -0/+30 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the issuable sidebar to remain collapsed on mobile devices Closes #28086 See merge request !10323 | ||||
| * | | | | | | | Set the issuable sidebar to remain collapsed on mobile devices | Jose Ivan Vargas Lopez | 2017-04-19 | 4 | -0/+30 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'branches-sort-toggle-empty' into 'master' | Alfredo Sumaran | 2017-04-19 | 2 | -9/+15 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed branches sort toggle being empty Closes #30950 See merge request !10764 | ||||
| * | | | | | | | Fixed branches sort toggle being emptybranches-sort-toggle-empty | Phil Hughes | 2017-04-18 | 2 | -9/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #30950 |