summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix user activities API version in docsfix-user-activity-apiSean McGivern2017-04-201-1/+1
|
* Merge branch 'uassign_on_member_removing' into 'master' Sean McGivern2017-04-2011-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_removingValery Sizov2017-04-209-27/+25
| |
| * Remove assigned_(issues|merge_requests) methods from the issuableValery Sizov2017-04-184-10/+4
| |
| * Using IssuablesFinder(s) for UI countersValery Sizov2017-04-181-1/+2
| |
| * Update permission docs. Add note about automatic unassigning when member ↵Valery Sizov2017-04-181-0/+3
| | | | | | | | leaves a team
| * update chnagelogValery Sizov2017-04-181-0/+4
| |
| * Unassign all Issues and Merge Requests when member leaves teamValery Sizov2017-04-182-1/+68
| |
* | Merge branch '31154-fix-plantuml-link-in-documentation' into 'master' Sean McGivern2017-04-201-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 Reynolds2017-04-201-0/+2
| | |
| * | Update plantuml.md to fix wrong introduced in link.Sascha Reynolds2017-04-191-1/+1
| | |
* | | Merge branch 'rollback-component-vue' into 'master' Phil Hughes2017-04-206-50/+58
|\ \ \ | | | | | | | | | | | | | | | | Refactor into .vue files See merge request !10788
| * | | Refactor into .vue filesFilipa Lacerda2017-04-206-50/+58
|/ / /
* | | Merge branch 'user-cohort-better-doc' into 'master' Sean McGivern2017-04-201-7/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for inactive users in the User cohort Closes #31195 See merge request !10809
| * | | Fixed wordinguser-cohort-better-docRegis Freyd2017-04-201-1/+1
| | | |
| * | | Fix headingsRegis Freyd2017-04-201-3/+6
| | | |
| * | | Add more information in the User cohort documentationRegis Freyd2017-04-201-4/+8
| | | | | | | | | | | | | | | | We needed to clarify what inactive users are.
* | | | Merge branch 'steps-to-MR' into 'master' Jacob Schatz2017-04-206-16/+408
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds vue js example application and documentation Closes #30031 and #30030 See merge request !10693
| * | | | Adds vue js example application and documentationFilipa Lacerda2017-04-206-16/+408
|/ / / /
* | | | Merge branch '27486-eslint-promises' into 'master' Filipa Lacerda2017-04-2021-23/+73
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add ES lint support to identify poorly written Promises See merge request !9969
| * | | | Add ES lint support to identify poorly written PromisesKushal Pandya2017-04-2021-23/+73
|/ / / /
* | | | Merge branch 'fix/29125' into 'master' Sean McGivern2017-04-205-1/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of fix/29125-ee to CE Closes #29125 See merge request !10796
| * | | | Add CHANGELOGfix/29125Douglas Barbosa Alexandre2017-04-191-0/+4
| | | | |
| * | | | Port of fix/29125-ee to CEDouglas Barbosa Alexandre2017-04-194-1/+36
| | | | |
* | | | | Merge branch 'issuable-state-custom-links' into 'master' Sean McGivern2017-04-202-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-linksAdam Niedzielski2017-04-192-34/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #30916 Change the presentation from [closed] to (closed)
* | | | | | Merge branch 'environments-vue-2' into 'master' Phil Hughes2017-04-208-59/+71
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Refactor into .vue files part 2 See merge request !10791
| * | | | | Refactor into .vue files part 2Filipa Lacerda2017-04-208-59/+71
|/ / / / /
* | | | | Merge branch 'plantuml-filter-after-highlight' into 'master' Sean McGivern2017-04-203-8/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix PlantUML integration in GFM Closes #30557 See merge request !10651
| * | | | | Fix PlantUML integration in GFMplantuml-filter-after-highlightAdam Niedzielski2017-04-193-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #30557 Use "lang" attribute instead of "class" in PlantumlFilter.
* | | | | | Merge branch 'dm-markup-helper-constants' into 'master' Robert Speicher2017-04-201-9/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use constants in Gitlab::MarkupHelper See merge request !10741
| * | | | | | Use constants in Gitlab::MarkupHelperDouwe Maan2017-04-201-9/+16
|/ / / / / /
* | | | | | Merge branch 'dm-fix-editing-files-on-forks' into 'master' Robert Speicher2017-04-2047-459/+274
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor changing files in web UI Closes #28711 See merge request !9323
| * | | | | | Refactor changing files in web UIDouwe Maan2017-04-2047-459/+274
|/ / / / / /
* | | | | | Merge branch 'hook_retries' into 'master' Douwe Maan2017-04-192-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add retries to system hook worker Closes #31109 See merge request !10801
| * | | | | | Add retry to system hook workerDrew Blessing2017-04-192-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 Maan2017-04-194-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-fixStan Hu2017-04-194-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 Sumaran2017-04-197-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" Bennett2017-04-197-6/+47
|/ / / / / / /
* | | | | | | Merge branch 'sh-add-index-to-system-note-metadata' into 'master' Sean McGivern2017-04-193-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-metadataStan Hu2017-04-193-1/+24
| |/ / / / / | | | | | | | | | | | | | | | | | | In issue 1, the sequential scan was taking 250+ ms.
* | | | | | Merge branch 'query-users-by-extern-uid' into 'master'Robert Speicher2017-04-195-8/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement search by extern_uid in Users API See merge request !10509
| * | | | | | Implement search by extern_uid in Users APIRobin Bobbitt2017-04-185-8/+59
| | | | | | |
* | | | | | | Merge branch '29977-style-comments-and-system-notes-real-time-updates' into ↵Clement Ho2017-04-198-32/+196
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add renderNote animation and added spec Closes #29977 See merge request !10623
| * | | | | | | Add renderNote animation and added specLuke "Jared" Bennett2017-04-198-32/+196
|/ / / / / / /
* | | | | | | Merge branch 'right-sidebar-closed-default-mobile' into 'master' Alfredo Sumaran2017-04-194-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 devicesJose Ivan Vargas Lopez2017-04-194-0/+30
|/ / / / / / /
* | | | | | | Merge branch 'branches-sort-toggle-empty' into 'master' Alfredo Sumaran2017-04-192-9/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed branches sort toggle being empty Closes #30950 See merge request !10764
| * | | | | | | Fixed branches sort toggle being emptybranches-sort-toggle-emptyPhil Hughes2017-04-182-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #30950