Merge lp:~aisrael/charms/precise/gitlab/charm-proof into lp:charms/gitlab

Proposed by Adam Israel
Status: Merged
Merged at revision: 8
Proposed branch: lp:~aisrael/charms/precise/gitlab/charm-proof
Merge into: lp:charms/gitlab
Diff against target: 322 lines (+295/-1)
3 files modified
config.yaml (+1/-1)
icon.svg (+292/-0)
metadata.yaml (+2/-0)
To merge this branch: bzr merge lp:~aisrael/charms/precise/gitlab/charm-proof
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+233837@code.launchpad.net

Description of the change

Add generic icon, categories in metadata.yaml, and default: stanza in config.yaml, so that charm proof will pass.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2013-02-01 22:47:17 +0000
3+++ config.yaml 2014-09-09 00:54:56 +0000
4@@ -2,7 +2,7 @@
5 admin_password:
6 type: string
7 description: Sets the admin password
8-
9+ default:
10 host:
11 type: string
12 description: The FQDN for your GitLab unit
13
14=== added file 'icon.svg'
15--- icon.svg 1970-01-01 00:00:00 +0000
16+++ icon.svg 2014-09-09 00:54:56 +0000
17@@ -0,0 +1,292 @@
18+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
19+<!-- Created with Inkscape (http://www.inkscape.org/) -->
20+
21+<svg
22+ xmlns:dc="http://purl.org/dc/elements/1.1/"
23+ xmlns:cc="http://creativecommons.org/ns#"
24+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
25+ xmlns:svg="http://www.w3.org/2000/svg"
26+ xmlns="http://www.w3.org/2000/svg"
27+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
28+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
29+ width="96"
30+ height="96"
31+ id="svg6517"
32+ version="1.1"
33+ inkscape:version="0.48.4 r9939"
34+ sodipodi:docname="juju-icon-placeholder-g.svg">
35+ <defs
36+ id="defs6519">
37+ <linearGradient
38+ id="Background">
39+ <stop
40+ id="stop4178"
41+ offset="0"
42+ style="stop-color:#b8b8b8;stop-opacity:1" />
43+ <stop
44+ id="stop4180"
45+ offset="1"
46+ style="stop-color:#c9c9c9;stop-opacity:1" />
47+ </linearGradient>
48+ <filter
49+ style="color-interpolation-filters:sRGB;"
50+ inkscape:label="Inner Shadow"
51+ id="filter1121">
52+ <feFlood
53+ flood-opacity="0.59999999999999998"
54+ flood-color="rgb(0,0,0)"
55+ result="flood"
56+ id="feFlood1123" />
57+ <feComposite
58+ in="flood"
59+ in2="SourceGraphic"
60+ operator="out"
61+ result="composite1"
62+ id="feComposite1125" />
63+ <feGaussianBlur
64+ in="composite1"
65+ stdDeviation="1"
66+ result="blur"
67+ id="feGaussianBlur1127" />
68+ <feOffset
69+ dx="0"
70+ dy="2"
71+ result="offset"
72+ id="feOffset1129" />
73+ <feComposite
74+ in="offset"
75+ in2="SourceGraphic"
76+ operator="atop"
77+ result="composite2"
78+ id="feComposite1131" />
79+ </filter>
80+ <filter
81+ style="color-interpolation-filters:sRGB;"
82+ inkscape:label="Drop Shadow"
83+ id="filter950">
84+ <feFlood
85+ flood-opacity="0.25"
86+ flood-color="rgb(0,0,0)"
87+ result="flood"
88+ id="feFlood952" />
89+ <feComposite
90+ in="flood"
91+ in2="SourceGraphic"
92+ operator="in"
93+ result="composite1"
94+ id="feComposite954" />
95+ <feGaussianBlur
96+ in="composite1"
97+ stdDeviation="1"
98+ result="blur"
99+ id="feGaussianBlur956" />
100+ <feOffset
101+ dx="0"
102+ dy="1"
103+ result="offset"
104+ id="feOffset958" />
105+ <feComposite
106+ in="SourceGraphic"
107+ in2="offset"
108+ operator="over"
109+ result="composite2"
110+ id="feComposite960" />
111+ <feBlend
112+ blend="normal"
113+ id="feBlend3895"
114+ in2="composite2" />
115+ </filter>
116+ <clipPath
117+ clipPathUnits="userSpaceOnUse"
118+ id="clipPath873">
119+ <g
120+ transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
121+ id="g875"
122+ inkscape:label="Layer 1"
123+ style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
124+ <path
125+ style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
126+ d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
127+ id="path877"
128+ inkscape:connector-curvature="0"
129+ sodipodi:nodetypes="sssssssss" />
130+ </g>
131+ </clipPath>
132+ <filter
133+ inkscape:collect="always"
134+ id="filter891"
135+ inkscape:label="Badge Shadow">
136+ <feGaussianBlur
137+ inkscape:collect="always"
138+ stdDeviation="0.71999962"
139+ id="feGaussianBlur893" />
140+ </filter>
141+ </defs>
142+ <sodipodi:namedview
143+ id="base"
144+ pagecolor="#ffffff"
145+ bordercolor="#666666"
146+ borderopacity="1.0"
147+ inkscape:pageopacity="0.0"
148+ inkscape:pageshadow="2"
149+ inkscape:zoom="8.1490724"
150+ inkscape:cx="6.3116087"
151+ inkscape:cy="46.975739"
152+ inkscape:document-units="px"
153+ inkscape:current-layer="layer3"
154+ showgrid="true"
155+ fit-margin-top="0"
156+ fit-margin-left="0"
157+ fit-margin-right="0"
158+ fit-margin-bottom="0"
159+ inkscape:window-width="1849"
160+ inkscape:window-height="1218"
161+ inkscape:window-x="123"
162+ inkscape:window-y="68"
163+ inkscape:window-maximized="0"
164+ showborder="true"
165+ showguides="true"
166+ inkscape:guide-bbox="true"
167+ inkscape:showpageshadow="false">
168+ <inkscape:grid
169+ type="xygrid"
170+ id="grid821" />
171+ <sodipodi:guide
172+ orientation="1,0"
173+ position="16,48"
174+ id="guide823" />
175+ <sodipodi:guide
176+ orientation="0,1"
177+ position="64,80"
178+ id="guide825" />
179+ <sodipodi:guide
180+ orientation="1,0"
181+ position="80,40"
182+ id="guide827" />
183+ <sodipodi:guide
184+ orientation="0,1"
185+ position="64,16"
186+ id="guide829" />
187+ </sodipodi:namedview>
188+ <metadata
189+ id="metadata6522">
190+ <rdf:RDF>
191+ <cc:Work
192+ rdf:about="">
193+ <dc:format>image/svg+xml</dc:format>
194+ <dc:type
195+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
196+ <dc:title />
197+ </cc:Work>
198+ </rdf:RDF>
199+ </metadata>
200+ <g
201+ inkscape:label="BACKGROUND"
202+ inkscape:groupmode="layer"
203+ id="layer1"
204+ transform="translate(268,-635.29076)"
205+ style="display:inline">
206+ <path
207+ style="fill:#333333;fill-opacity:0.93333334000000001;stroke:none;display:inline;filter:url(#filter1121);opacity:0.7"
208+ d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
209+ id="path6455"
210+ inkscape:connector-curvature="0"
211+ sodipodi:nodetypes="sssssssss" />
212+ </g>
213+ <g
214+ inkscape:groupmode="layer"
215+ id="layer3"
216+ inkscape:label="PLACEHOLDER LETTER"
217+ style="display:inline">
218+ <text
219+ xml:space="preserve"
220+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter950);font-family:Sans"
221+ x="32.403999"
222+ y="57.688"
223+ id="text3891"
224+ sodipodi:linespacing="125%"><tspan
225+ sodipodi:role="line"
226+ id="tspan3893"
227+ x="32.403999"
228+ y="57.688"
229+ style="font-size:56px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium">g</tspan></text>
230+ <rect
231+ style="opacity:0.69999999999999996;fill:none;stroke:none"
232+ id="rect3021"
233+ width="64"
234+ height="64"
235+ x="16"
236+ y="16" />
237+ </g>
238+ <g
239+ inkscape:groupmode="layer"
240+ id="layer2"
241+ inkscape:label="BADGE"
242+ style="display:none"
243+ sodipodi:insensitive="true">
244+ <g
245+ style="display:inline"
246+ transform="translate(-340.00001,-581)"
247+ id="g4394"
248+ clip-path="none">
249+ <g
250+ id="g855">
251+ <g
252+ inkscape:groupmode="maskhelper"
253+ id="g870"
254+ clip-path="url(#clipPath873)"
255+ style="opacity:0.6;filter:url(#filter891)">
256+ <path
257+ transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
258+ d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
259+ sodipodi:ry="12"
260+ sodipodi:rx="12"
261+ sodipodi:cy="552.36218"
262+ sodipodi:cx="252"
263+ id="path844"
264+ style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
265+ sodipodi:type="arc" />
266+ </g>
267+ <g
268+ id="g862">
269+ <path
270+ sodipodi:type="arc"
271+ style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
272+ id="path4398"
273+ sodipodi:cx="252"
274+ sodipodi:cy="552.36218"
275+ sodipodi:rx="12"
276+ sodipodi:ry="12"
277+ d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
278+ transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
279+ <path
280+ transform="matrix(1.25,0,0,1.25,33,-100.45273)"
281+ d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
282+ sodipodi:ry="12"
283+ sodipodi:rx="12"
284+ sodipodi:cy="552.36218"
285+ sodipodi:cx="252"
286+ id="path4400"
287+ style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
288+ sodipodi:type="arc" />
289+ <path
290+ sodipodi:type="star"
291+ style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
292+ id="path4459"
293+ sodipodi:sides="5"
294+ sodipodi:cx="666.19574"
295+ sodipodi:cy="589.50385"
296+ sodipodi:r1="7.2431178"
297+ sodipodi:r2="4.3458705"
298+ sodipodi:arg1="1.0471976"
299+ sodipodi:arg2="1.6755161"
300+ inkscape:flatsided="false"
301+ inkscape:rounded="0.1"
302+ inkscape:randomized="0"
303+ d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z"
304+ transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
305+ </g>
306+ </g>
307+ </g>
308+ </g>
309+</svg>
310
311=== modified file 'metadata.yaml'
312--- metadata.yaml 2013-02-01 22:47:17 +0000
313+++ metadata.yaml 2014-09-09 00:54:56 +0000
314@@ -2,6 +2,8 @@
315 summary: "Self hosted Git management software"
316 maintainer: Helio L Mota <helio.mota@gmail.com>
317 description: A fast, secure and stable solution based on Rails & Gitolite. Free and open-source Distributed under the MIT License.
318+categories:
319+- Application
320 provides:
321 website:
322 interface: http

Subscribers

People subscribed via source and target branches

to all changes: