diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-07 16:20:17 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-07 16:20:17 +0800 |
commit | 3aed06cfa387406c2e0257a8783bc05b53d4385a (patch) | |
tree | 91d12caf54a468bc272d92bca4542722a42e2033 /changelogs/unreleased/fix-admin-projects.yml | |
parent | 964814e99a30dd9fb0194e64cc01fee79bd027aa (diff) | |
parent | c970fa973d482c50820db75d08d74bd5c1e9d475 (diff) | |
download | gitlab-ce-3aed06cfa387406c2e0257a8783bc05b53d4385a.tar.gz |
Merge remote-tracking branch 'upstream/master' into test-pg-mysql
* upstream/master: (590 commits)
Fixes failing spec
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
...
Diffstat (limited to 'changelogs/unreleased/fix-admin-projects.yml')
-rw-r--r-- | changelogs/unreleased/fix-admin-projects.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-admin-projects.yml b/changelogs/unreleased/fix-admin-projects.yml new file mode 100644 index 00000000000..d192f07004c --- /dev/null +++ b/changelogs/unreleased/fix-admin-projects.yml @@ -0,0 +1,4 @@ +--- +title: Fix layout of projects page on admin area +merge_request: +author: |