Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '32587-fix-horse-racing-emoji-codepointat-npe' into 'master' | Filipa Lacerda | 2017-06-07 | 2 | -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-npe | Eric Eastwood | 2017-06-02 | 2 | -1/+3 |
| | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32587 | ||||
* | | Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master' | Douwe Maan | 2017-06-07 | 8 | -7/+80 |
|\ \ | | | | | | | | | | | | | | | | | | | Expand/collapse close & backlog lists in issue boards Closes #23917 See merge request !11820 | ||||
| * | | updated service spec | Phil Hughes | 2017-06-06 | 1 | -1/+2 |
| | | | |||||
| * | | changed the icon for the collapsed backlog list | Phil Hughes | 2017-06-01 | 3 | -2/+7 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | fixed boards specs | Phil Hughes | 2017-06-01 | 3 | -2/+3 |
| | | | | | | | | | | | | added key to assignee avatar loop | ||||
| * | | spec updates | Phil Hughes | 2017-05-31 | 2 | -2/+2 |
| | | | |||||
| * | | Expand/collapse close & backlog lists in issue boards | Phil Hughes | 2017-05-31 | 4 | -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 Hughes | 2017-06-07 | 1 | -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-scss | Mike Greiling | 2017-06-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch '3191-deploy-keys-update' into 'master' | Rémy Coutable | 2017-06-07 | 3 | -13/+47 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Implement ability to update deploy keys Closes #3191 See merge request !10383 | ||||
| * | | | Implement ability to update deploy keys | Alexander Randa | 2017-06-02 | 3 | -13/+47 |
| | | | | |||||
* | | | | Merge branch '12910-snippets-description' into 'master' | Phil Hughes | 2017-06-07 | 2 | -1/+16 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support descriptions for snippets Closes #31894 See merge request !11071 | ||||
| * | | | | Support uploads for newly created personal snippets12910-snippets-description | Jarka Kadlecova | 2017-06-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Support descriptions for snippets | Jarka Kadlecova | 2017-05-31 | 2 | -1/+16 |
| | |/ / | |/| | | |||||
* | | | | Resolve "Simplified Repository Settings page" | Mike Greiling | 2017-06-07 | 4 | -1/+118 |
| | | | | |||||
* | | | | Merge branch '31633-animate-issue' into 'master' | Phil Hughes | 2017-06-07 | 5 | -8/+57 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | animate adding issue to boards Closes #31633 See merge request !11785 | ||||
| * | | | | animate adding issue to boards31633-animate-issue | Simon Knox | 2017-06-01 | 5 | -8/+57 |
| | | | | | | | | | | | | | | | | | | | | fix some false positive tests for board_new_issue | ||||
* | | | | | Environment detail view | Annabel Dunstone Gray | 2017-06-06 | 2 | -2/+11 |
| | | | | | |||||
* | | | | | Merge branch 'fix_commits_page' into 'master' | Filipa Lacerda | 2017-06-06 | 3 | -7/+40 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplication of commits header on commits page Closes #13879 See merge request !11006 | ||||
| * | | | | | Fix duplication of commits header on commits page | blackst0ne | 2017-06-03 | 3 | -7/+40 |
| | | | | | | |||||
* | | | | | | Change from double click to single click to open dropdownsingle-click-filter | Clement Ho | 2017-06-06 | 2 | -26/+16 |
| | | | | | | |||||
* | | | | | | Move issuable bulk edit form into a new sidebar.28340-mass-edit-issues-and-mrs-from-sidebar | Bryce Johnson | 2017-06-06 | 11 | -249/+407 |
| | | | | | | |||||
* | | | | | | Responsive environment tables | Annabel Dunstone Gray | 2017-06-06 | 11 | -117/+226 |
| | | | | | | |||||
* | | | | | | Resolve "When changing project visibility setting, change other dropdowns ↵ | Mike Greiling | 2017-06-06 | 3 | -4/+74 |
| | | | | | | | | | | | | | | | | | | | | | | | | automatically" | ||||
* | | | | | | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master' | Douwe Maan | 2017-06-05 | 1 | -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 CE | Tiago Botelho | 2017-06-05 | 1 | -0/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'added_chinese_for_i18n' into 'master' | Douwe Maan | 2017-06-05 | 3 | -0/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Chinese translation of Cycle Analytics Page to I18N See merge request !11644 | ||||
| * | | | | | | Optimize translation content | 黄涛 | 2017-06-05 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Optimize the translation of zh-TW 2. Synchronous zh-CN, zh-HK translation | ||||
| * | | | | | | Add translation zh_TW to I18N | 黄涛 | 2017-06-05 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Add translation zh_HK to I18N | 黄涛 | 2017-06-05 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Change the language name zh to zh_CN | 黄涛 | 2017-06-05 | 2 | -195/+1 |
| | | | | | | | |||||
| * | | | | | | fix plural form of translation | 黄涛 | 2017-06-05 | 1 | -16/+8 |
| | | | | | | | |||||
| * | | | | | | optimize part of the translation | 黄涛 | 2017-06-05 | 1 | -28/+28 |
| | | | | | | | |||||
| * | | | | | | added Simplified Chinese to I18N | 黄涛 | 2017-06-05 | 1 | -0/+203 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master' | Tim Zallmann | 2017-06-05 | 2 | -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-refactorings | James Edwards-Jones | 2017-05-31 | 2 | -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 Hughes | 2017-06-05 | 6 | -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-3 | Luke "Jared" Bennett | 2017-06-02 | 1 | -0/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into ↵ | Luke "Jared" Bennett | 2017-06-02 | 60 | -191/+1697 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-realtime-edited-text-for-issues-9-3 | ||||
| * | | | | | | | | Review changes, improve editable helper spec and add hasUpdated computer to ↵ | Luke "Jared" Bennett | 2017-05-31 | 1 | -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" Bennett | 2017-05-31 | 6 | -18/+100 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '30469-convdev-index' into 'master' | Sean McGivern | 2017-06-05 | 6 | -9/+296 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConvDev Index Closes #30469 See merge request !11377 | ||||
| * | | | | | | | | fixup some classnames and media queries | Simon Knox | 2017-06-03 | 1 | -31/+14 |
| | | | | | | | | | |||||
| * | | | | | | | | Add border radius | Annabel Dunstone Gray | 2017-06-01 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add Conversational Development Index page to admin panel | Taurie Davis, Simon Knox and Adam Niedzielski | 2017-06-01 | 6 | -9/+312 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Improve user experience around slash commands in instant comments | Kushal Pandya | 2017-06-05 | 3 | -19/+101 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | Merge branch '32118-new-environment-btn-copy' into 'master' | Annabel Dunstone Gray | 2017-06-03 | 1 | -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-copy | tauriedavis | 2017-06-02 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch '32832-confidential-issue-overflow' into 'master' | Annabel Dunstone Gray | 2017-06-02 | 1 | -2/+17 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32832 Remove overflow from comment form for confidential issues and vertically a… Closes #32832 and #32926 See merge request !11867 |