summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '32587-fix-horse-racing-emoji-codepointat-npe' into 'master'Filipa Lacerda2017-06-072-1/+3
|\ | | | | | | | | | | | | Fix NPE with horse racing emoji check Closes #32587 See merge request !11872
| * Fix NPE with horse racing emoji check32587-fix-horse-racing-emoji-codepointat-npeEric Eastwood2017-06-022-1/+3
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32587
* | Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'Douwe Maan2017-06-078-7/+80
|\ \ | | | | | | | | | | | | | | | | | | Expand/collapse close & backlog lists in issue boards Closes #23917 See merge request !11820
| * | updated service specPhil Hughes2017-06-061-1/+2
| | |
| * | changed the icon for the collapsed backlog listPhil Hughes2017-06-013-2/+7
| | | | | | | | | | | | [ci skip]
| * | fixed boards specsPhil Hughes2017-06-013-2/+3
| | | | | | | | | | | | added key to assignee avatar loop
| * | spec updatesPhil Hughes2017-05-312-2/+2
| | |
| * | Expand/collapse close & backlog lists in issue boardsPhil Hughes2017-05-314-4/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | The closed & backlog lists in issue boards are no collapsible. They can be collapsed independently of each other & this selection is then saved to the browser through localStorage. When the page loads, the code gets the data from localStorage & determines whether to show or hide the list Closes #23917
* | | Merge branch 'backport-ee-fix-settings-scss' into 'master'Phil Hughes2017-06-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Backport settings.scss bug fix from EE branch See merge request !11969
| * | | set overflow:visible to prevent dropdowns from getting cut offbackport-ee-fix-settings-scssMike Greiling2017-06-071-1/+1
| | | |
* | | | Merge branch '3191-deploy-keys-update' into 'master'Rémy Coutable2017-06-073-13/+47
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Implement ability to update deploy keys Closes #3191 See merge request !10383
| * | | Implement ability to update deploy keysAlexander Randa2017-06-023-13/+47
| | | |
* | | | Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-072-1/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support descriptions for snippets Closes #31894 See merge request !11071
| * | | | Support uploads for newly created personal snippets12910-snippets-descriptionJarka Kadlecova2017-06-071-1/+1
| | | | |
| * | | | Support descriptions for snippetsJarka Kadlecova2017-05-312-1/+16
| | |/ / | |/| |
* | | | Resolve "Simplified Repository Settings page"Mike Greiling2017-06-074-1/+118
| | | |
* | | | Merge branch '31633-animate-issue' into 'master'Phil Hughes2017-06-075-8/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | animate adding issue to boards Closes #31633 See merge request !11785
| * | | | animate adding issue to boards31633-animate-issueSimon Knox2017-06-015-8/+57
| | | | | | | | | | | | | | | | | | | | fix some false positive tests for board_new_issue
* | | | | Environment detail viewAnnabel Dunstone Gray2017-06-062-2/+11
| | | | |
* | | | | Merge branch 'fix_commits_page' into 'master'Filipa Lacerda2017-06-063-7/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplication of commits header on commits page Closes #13879 See merge request !11006
| * | | | | Fix duplication of commits header on commits pageblackst0ne2017-06-033-7/+40
| | | | | |
* | | | | | Change from double click to single click to open dropdownsingle-click-filterClement Ho2017-06-062-26/+16
| | | | | |
* | | | | | Move issuable bulk edit form into a new sidebar.28340-mass-edit-issues-and-mrs-from-sidebarBryce Johnson2017-06-0611-249/+407
| | | | | |
* | | | | | Responsive environment tablesAnnabel Dunstone Gray2017-06-0611-117/+226
| | | | | |
* | | | | | Resolve "When changing project visibility setting, change other dropdowns ↵Mike Greiling2017-06-063-4/+74
| | | | | | | | | | | | | | | | | | | | | | | | automatically"
* | | | | | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'Douwe Maan2017-06-051-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | backports changed import logic from pull mirroring feature into CE See merge request !11850
| * | | | | | backports changed import logic from pull mirroring feature into CETiago Botelho2017-06-051-0/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'added_chinese_for_i18n' into 'master'Douwe Maan2017-06-053-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Chinese translation of Cycle Analytics Page to I18N See merge request !11644
| * | | | | | Optimize translation content黄涛2017-06-053-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Optimize the translation of zh-TW 2. Synchronous zh-CN, zh-HK translation
| * | | | | | Add translation zh_TW to I18N黄涛2017-06-051-0/+1
| | | | | | |
| * | | | | | Add translation zh_HK to I18N黄涛2017-06-051-0/+1
| | | | | | |
| * | | | | | Change the language name zh to zh_CN黄涛2017-06-052-195/+1
| | | | | | |
| * | | | | | fix plural form of translation黄涛2017-06-051-16/+8
| | | | | | |
| * | | | | | optimize part of the translation黄涛2017-06-051-28/+28
| | | | | | |
| * | | | | | added Simplified Chinese to I18N黄涛2017-06-051-0/+203
| | | | | | |
* | | | | | | Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master'Tim Zallmann2017-06-052-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE refactorings for Protected Tag EE-only functionality See merge request !11125
| * | | | | | | Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactoringsJames Edwards-Jones2017-05-312-4/+6
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Improvements and refactorings were made while adding role based permissions for protected tags to EE. This doesn’t backport the feature, but should improve code quality and minimize divergence.
* | | | | | | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-056-18/+95
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. See merge request !11478
| * | | | | | | Fix up merge issuesfix-realtime-edited-text-for-issues-9-3Luke "Jared" Bennett2017-06-021-0/+3
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into ↵Luke "Jared" Bennett2017-06-0260-191/+1697
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-realtime-edited-text-for-issues-9-3
| * | | | | | | | Review changes, improve editable helper spec and add hasUpdated computer to ↵Luke "Jared" Bennett2017-05-311-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_show app Fix builds by only merge when updated_at_by is presnse Fix issue_show app.vue hasUpdated reference to state Fix missing bracket
| * | | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-316-18/+100
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '30469-convdev-index' into 'master'Sean McGivern2017-06-056-9/+296
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConvDev Index Closes #30469 See merge request !11377
| * | | | | | | | fixup some classnames and media queriesSimon Knox2017-06-031-31/+14
| | | | | | | | |
| * | | | | | | | Add border radiusAnnabel Dunstone Gray2017-06-011-0/+1
| | | | | | | | |
| * | | | | | | | Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski2017-06-016-9/+312
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Improve user experience around slash commands in instant commentsKushal Pandya2017-06-053-19/+101
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch '32118-new-environment-btn-copy' into 'master'Annabel Dunstone Gray2017-06-031-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32118 Make New environment empty state btn lowercase Closes #32118 See merge request !11350
| * | | | | | 32118 Make New environment empty state btn lowercase32118-new-environment-btn-copytauriedavis2017-06-021-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '32832-confidential-issue-overflow' into 'master'Annabel Dunstone Gray2017-06-021-2/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32832 Remove overflow from comment form for confidential issues and vertically a… Closes #32832 and #32926 See merge request !11867