summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup duplicates in deploymentEntityDetailed and add small spec tests26914-deploy_history_data_sourcePawel Chojnacki2017-04-203-24/+31
|
* Reduce the amount of data deployment endpoint returnsPawel Chojnacki2017-04-204-13/+30
|
* Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2017-04-201955-18479/+102777
|\ | | | | | | 26914-add_deploy_history_data_source
| * 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
| * | | | | | Merge branch 'fix-link-prometheus-opening-outside-gitlab' into 'master' Phil Hughes2017-04-192-1/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed target blank from the environments component Closes #31029 See merge request !10726
| | * | | | | | Removed target blank from the environments componentJose Ivan Vargas Lopez2017-04-192-1/+4
| |/ / / / / /
| * | | | | | Merge branch 'patch-7' into 'master' Sean McGivern2017-04-191-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update groups.md found typo See merge request !10792
| | * | | | | | Update groups.md found typojoe d2017-04-191-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'group-milestone-date-fields-fix' into 'master' Filipa Lacerda2017-04-194-3/+46
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed group milestones date pickers not working Closes #31095 See merge request !10779
| | * | | | | | Fixed group milestones date pickers not workinggroup-milestone-date-fields-fixPhil Hughes2017-04-194-3/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #31095
| * | | | | | | Merge branch '30484-profile-dropdown-account-name' into 'master' Annabel Dunstone Gray2017-04-197-7/+24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added profile name to user dropdown Closes #30484 See merge request !10469
| | * | | | | | | Added profile name to user dropdownDimitrie Hoekstra2017-04-197-7/+24
| |/ / / / / / /
| * | | | | | | Merge branch ↵Annabel Dunstone Gray2017-04-192-3/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '29734-prometheus-monitoring-page-displays-button-to-control-manual-actions' into 'master' Remove manual deployment controls from Environment metrics page Closes #29734 See merge request !10769
| | * | | | | | | Remove manual deployment controls from Environment metrics pageJoshua Lambert2017-04-192-3/+4
| |/ / / / / / /
| * | | | | | | Merge branch '31137-ensure-yarn-installed' into 'master' Alfredo Sumaran2017-04-191-7/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove node modules cache because we already use artifacts Closes #29226 and #31137 See merge request !10781
| | * | | | | | | Remove node modules cache because we already use artifactsLin Jen-Shin (godfat)2017-04-191-7/+0
| |/ / / / / / /
| * | | | | | | Merge branch 'project-group-icon-links' into 'master' Annabel Dunstone Gray2017-04-193-5/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed project & group icons not being clickable Closes #31073 See merge request !10778
| | * | | | | | | Fixed project & group icons not being clickableproject-group-icon-linksPhil Hughes2017-04-193-5/+11
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Closes #31073
| * | | | | | | Merge branch 'issuable-state-only-notes-and-description' into 'master' Sean McGivern2017-04-194-13/+25
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display issuable state only in notes and issuable description Closes #30964 See merge request !10789
| | * | | | | | | Display issuable state only in notes and issuable descriptionAdam Niedzielski2017-04-194-13/+25
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Closes #30964
| * | | | | | | Merge branch '30985-cancel-pipelines' into 'master'Phil Hughes2017-04-195-4/+20
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroy tooltip in async buttons and dropdowns Closes #30985 See merge request !10768
| | * | | | | | Use refs instead of query the DOMFilipa Lacerda2017-04-192-2/+4
| | | | | | | |
| | * | | | | | Merge branch 'master' into 30985-cancel-pipelinesFilipa Lacerda2017-04-1966-2656/+2677
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Remove special naming of pipelines folder remove changelog (not needed) Fix active user count add spec and changelog Add migration to remove orphaned notification settings Improve container registry repository path specs Fix duplicated container repository names update textarea height and refocus when attaching files Remove IIFEs in filtered_search_bundle.js Remove IIFEs from diff_notes_bundle.js
| | * | | | | | Remove unused argument30985-cancel-pipelinesFilipa Lacerda2017-04-191-1/+1
| | | | | | | |
| | * | | | | | Only destroy the component's tooltipFilipa Lacerda2017-04-195-10/+14
| | | | | | | |
| | * | | | | | Merge branch 'master' into 30985-cancel-pipelinesFilipa Lacerda2017-04-1939-98/+360
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix container registry navigation menu highlights Resolve "Mini pipeline graph + status badge, when updating in real time don't change color and svg icon" Refactor group search out of global search disables test settings on chat notification services when repository is empty Disable initialization table pipeline for new merge request form Review changes, used eq instead of match Remove lighten blue and add blue-25 for background Fixed tests 29595 Customize experience callout design Remove unneeded format block Fixed tests 29595 Customize experience callout design Updated specs Remove helper [ci skip] Use favicon full path Improve gitaly_address error message
| | * | | | | | Destroy tooltip in async buttons and tooltipsFilipa Lacerda2017-04-185-0/+10
| | | | | | | |
| * | | | | | | Merge branch 'add-droplab-docs' into 'master' Clement Ho2017-04-195-0/+408
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added and updated droplab docs See merge request !10569
| | * | | | | | | Added and updated droplab docsLuke "Jared" Bennett2017-04-195-0/+408
| |/ / / / / / /