Download as
Browse Code »

Commit cab7d7686f6c11bd77564eb73abd85fb9f61c58e

Authored by Dmitriy Zaporozhets
1 parent 304baaf8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Help#permissions improved

Showing 3 changed files with 82 additions and 75 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @cab7d76
@@ -361,3 +361,10 @@ img.emoji { @@ -361,3 +361,10 @@ img.emoji {
361 font-size: 14px; 361 font-size: 14px;
362 line-height: 24px; 362 line-height: 24px;
363 } 363 }
  364 +
  365 +table {
  366 + td.permission-x {
  367 + background: #D9EDF7 !important;
  368 + text-align: center;
  369 + }
  370 +}
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @cab7d76
1 /** COLORS **/ 1 /** COLORS **/
2 -.cgray { color:gray }  
3 -.cred { color:#D12F19 }  
4 -.cgreen { color:#4a2 }  
5 -.cblue { color:#29A }  
6 -.cblack { color:#111 }  
7 -.cdark { color:#444 }  
8 -.cwhite { color:#fff!important }  
9 -.bgred { background:#F2DEDE!important } 2 +.cgray { color: gray }
  3 +.cred { color: #D12F19 }
  4 +.cgreen { color: #4a2 }
  5 +.cblue { color: #29A }
  6 +.cblack { color: #111 }
  7 +.cdark { color: #444 }
  8 +.cwhite { color: #fff!important }
  9 +.bgred { background: #F2DEDE!important }
10 10
11 /** COMMON CLASSES **/ 11 /** COMMON CLASSES **/
12 .left { float:left } 12 .left { float:left }
app/views/help/permissions.html.haml
  Diff comments   View file @cab7d76
1 = render layout: 'help/layout' do 1 = render layout: 'help/layout' do
2 %h3.page-title Permissions 2 %h3.page-title Permissions
3 3
4 - %table 4 + %table.table
5 %thead 5 %thead
6 %tr 6 %tr
7 - %td  
8 - %td Guest  
9 - %td Reporter  
10 - %td Developer  
11 - %td Master  
12 - %td Owner 7 + %th Action
  8 + %th Guest
  9 + %th Reporter
  10 + %th Developer
  11 + %th Master
  12 + %th Owner
13 %tbody 13 %tbody
14 %tr 14 %tr
15 %td Create new issue 15 %td Create new issue
16 - %td X  
17 - %td X  
18 - %td X  
19 - %td X  
20 - %td 16 + %td.permission-x ✓
  17 + %td.permission-x ✓
  18 + %td.permission-x ✓
  19 + %td.permission-x ✓
  20 + %td.permission-x ✓
21 %tr 21 %tr
22 %td Leave comments 22 %td Leave comments
23 - %td X  
24 - %td X  
25 - %td X  
26 - %td X  
27 - %td 23 + %td.permission-x ✓
  24 + %td.permission-x ✓
  25 + %td.permission-x ✓
  26 + %td.permission-x ✓
  27 + %td.permission-x ✓
28 %tr 28 %tr
29 %td Write on project wall 29 %td Write on project wall
30 - %td X  
31 - %td X  
32 - %td X  
33 - %td X  
34 - %td 30 + %td.permission-x ✓
  31 + %td.permission-x ✓
  32 + %td.permission-x ✓
  33 + %td.permission-x ✓
  34 + %td.permission-x ✓
35 %tr 35 %tr
36 %td Pull project code 36 %td Pull project code
37 %td 37 %td
38 - %td X  
39 - %td X  
40 - %td X  
41 - %td 38 + %td.permission-x ✓
  39 + %td.permission-x ✓
  40 + %td.permission-x ✓
  41 + %td.permission-x ✓
42 %tr 42 %tr
43 %td Download project 43 %td Download project
44 %td 44 %td
45 - %td X  
46 - %td X  
47 - %td X  
48 - %td 45 + %td.permission-x ✓
  46 + %td.permission-x ✓
  47 + %td.permission-x ✓
  48 + %td.permission-x ✓
49 %tr 49 %tr
50 %td Create code snippets 50 %td Create code snippets
51 %td 51 %td
52 - %td X  
53 - %td X  
54 - %td X  
55 - %td 52 + %td.permission-x ✓
  53 + %td.permission-x ✓
  54 + %td.permission-x ✓
  55 + %td.permission-x ✓
56 %tr 56 %tr
57 %td Create new merge request 57 %td Create new merge request
58 %td 58 %td
59 %td 59 %td
60 - %td X  
61 - %td X  
62 - %td 60 + %td.permission-x ✓
  61 + %td.permission-x ✓
  62 + %td.permission-x ✓
63 %tr 63 %tr
64 %td Create new branches 64 %td Create new branches
65 %td 65 %td
66 %td 66 %td
67 - %td X  
68 - %td X  
69 - %td 67 + %td.permission-x ✓
  68 + %td.permission-x ✓
  69 + %td.permission-x ✓
70 %tr 70 %tr
71 %td Push to non-protected branches 71 %td Push to non-protected branches
72 %td 72 %td
73 %td 73 %td
74 - %td X  
75 - %td X  
76 - %td 74 + %td.permission-x ✓
  75 + %td.permission-x ✓
  76 + %td.permission-x ✓
77 %tr 77 %tr
78 %td Remove non-protected branches 78 %td Remove non-protected branches
79 %td 79 %td
80 %td 80 %td
81 - %td X  
82 - %td X  
83 - %td 81 + %td.permission-x ✓
  82 + %td.permission-x ✓
  83 + %td.permission-x ✓
84 %tr 84 %tr
85 %td Add tags 85 %td Add tags
86 %td 86 %td
87 %td 87 %td
88 - %td X  
89 - %td X  
90 - %td 88 + %td.permission-x ✓
  89 + %td.permission-x ✓
  90 + %td.permission-x ✓
91 %tr 91 %tr
92 %td Write a wiki 92 %td Write a wiki
93 %td 93 %td
94 %td 94 %td
95 - %td X  
96 - %td X  
97 - %td 95 + %td.permission-x ✓
  96 + %td.permission-x ✓
  97 + %td.permission-x ✓
98 %tr 98 %tr
99 %td Add new team members 99 %td Add new team members
100 %td 100 %td
101 %td 101 %td
102 %td 102 %td
103 - %td X  
104 - %td 103 + %td.permission-x ✓
  104 + %td.permission-x ✓
105 %tr 105 %tr
106 %td Push to protected branches 106 %td Push to protected branches
107 %td 107 %td
108 %td 108 %td
109 %td 109 %td
110 - %td X  
111 - %td 110 + %td.permission-x ✓
  111 + %td.permission-x ✓
112 %tr 112 %tr
113 %td Remove protected branches 113 %td Remove protected branches
114 %td 114 %td
115 %td 115 %td
116 %td 116 %td
117 - %td X  
118 - %td 117 + %td.permission-x ✓
  118 + %td.permission-x ✓
119 %tr 119 %tr
120 %td Edit project 120 %td Edit project
121 %td 121 %td
122 %td 122 %td
123 %td 123 %td
124 - %td X  
125 - %td 124 + %td.permission-x ✓
  125 + %td.permission-x ✓
126 %tr 126 %tr
127 %td Add Deploy Keys to project 127 %td Add Deploy Keys to project
128 %td 128 %td
129 %td 129 %td
130 %td 130 %td
131 - %td X  
132 - %td 131 + %td.permission-x ✓
  132 + %td.permission-x ✓
133 %tr 133 %tr
134 %td Configure Project Hooks 134 %td Configure Project Hooks
135 %td 135 %td
136 %td 136 %td
137 %td 137 %td
138 - %td X  
139 - %td 138 + %td.permission-x ✓
  139 + %td.permission-x ✓
140 %tr 140 %tr
141 %td Switch public mode 141 %td Switch public mode
142 %td 142 %td
143 %td 143 %td
144 %td 144 %td
145 %td 145 %td
146 - %td X 146 + %td.permission-x ✓
147 %tr 147 %tr
148 %td Transfer project to another namespace 148 %td Transfer project to another namespace
149 %td 149 %td
150 %td 150 %td
151 %td 151 %td
152 %td 152 %td
153 - %td X 153 + %td.permission-x ✓
154 %tr 154 %tr
155 %td Remove project 155 %td Remove project
156 %td 156 %td
157 %td 157 %td
158 %td 158 %td
159 %td 159 %td
160 - %td X 160 + %td.permission-x ✓