diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-07 14:40:20 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-07 14:40:20 +0800 |
| commit | f8fe64a630b2adff8d260c7cc92f89ff8cfd0519 (patch) | |
| tree | 19b2a2bc32c67e136273c986040cb456b6965488 /.ruby-version | |
| parent | e28fc7b1d366e044cd2f90fe54590966688709c5 (diff) | |
| parent | 6ea35f98241b351747dd445738be58e3d65cafa2 (diff) | |
| download | gitlab-ce-f8fe64a630b2adff8d260c7cc92f89ff8cfd0519.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits_if_not_head
* upstream/master: (58 commits)
Fix icon name error
Rewrite system note helper
Change edit icon
Leave icon area blank if legacy note; remove diamond icon
Fix positioning of note icons
Fix newline errors
Add remaining system note icons
Add system notes icon helper; add icons
Fixed specs Updated JS that was causing the hints to appear & then disappear
Update tests
Fix broken spinach test
Reuse code
Improve shortcuts code
Adds ShortcutsDashboardNavigation to globals comment since its a global variable
Fix shortcut specs
Reorganize shortcut help menu
Change todos shortcut to shift
Change shortcuts
Switch global shortcuts to shift; reuse key styles from help menu
Map bindings to lowercase letters; only show key bindings when using keyboard shortcut
...
Diffstat (limited to '.ruby-version')
0 files changed, 0 insertions, 0 deletions