summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add different propssketch43viewerJacob Schatz2017-03-312-2/+24
* Borders & background color on sidebarsPhil Hughes2017-03-311-0/+10
* Removed canvas that was pushing panels aroundPhil Hughes2017-03-312-3/+2
* Merge branch 'sketch43viewer' of gitlab.com:gitlab-org/gitlab-ce into sketch4...Jacob Schatz2017-03-313-13/+25
|\
| * Made sketch viewer into panelsPhil Hughes2017-03-313-13/+25
* | Add hex colors and prop info.Jacob Schatz2017-03-314-31/+105
|/
* Add sketch layer pages preview with sizing info.Jacob Schatz2017-03-316-4/+290
* eslint fixesPhil Hughes2017-03-303-27/+25
* Added testsPhil Hughes2017-03-303-1/+144
* Take out VuePhil Hughes2017-03-293-49/+76
* wrap Uint8Array in hard brackets after re-transforming content to Uint8ArrayRegis2017-03-291-8/+1
* use webkit || regular URL apiRegis2017-03-281-4/+5
* to closest working state with JSZipRegis2017-03-281-41/+32
* add deps to git historyRegis2017-03-282-1/+39
* Load sketch43 JSON file.Jacob Schatz2017-03-295-0/+82
* Merge branch '27293-remove-repeated-labels' into 'master' Clement Ho2017-03-284-5/+41
|\
| * Remove duplicated tokens in issuable search barAlfredo Sumaran2017-03-284-5/+41
|/
* Merge branch 'glensc/gitlab-ce-17325-rugged-gem-update' into 'master' Robert Speicher2017-03-284-27/+14
|\
| * Use Rugged::SORT_NONE instead of Rugged::SORT_DATEAdam Niedzielski2017-03-281-3/+3
| * Remove unused method Gitlab::Git::Repository#commits_sinceAdam Niedzielski2017-03-281-17/+0
| * Update rugged to 0.25.1.1Elan Ruusamäe2017-03-283-7/+11
* | Merge branch 'ipython-notebook-viewer' into 'master' Jacob Schatz2017-03-289-0/+6146
|\ \
| * | Component now includes scoped stylesPhil Hughes2017-03-243-156/+2663
| * | Fixed spec checking for highlightjs classPhil Hughes2017-03-231-2/+2
| * | Updated notebooklab with latest code highlighting changesPhil Hughes2017-03-232-1332/+1029
| * | Added testsPhil Hughes2017-03-236-78/+265
| * | Updated notebooklab libraryPhil Hughes2017-03-232-139/+1722
| * | Stops errors in the rendering breaking the pagePhil Hughes2017-03-232-10/+49
| * | Loads raw JSON & displays in the componentPhil Hughes2017-03-234-4/+61
| * | Started iPython notebook viewerPhil Hughes2017-03-235-0/+2076
* | | Merge branch 'improve-mr-reviews-in-contributing' into 'master' Jacob Schatz2017-03-281-7/+9
|\ \ \
| * | | Improve the MR guidelines from the CONTRIBUTING guideimprove-mr-reviews-in-contributingRémy Coutable2017-03-161-7/+9
* | | | Merge branch '29414-fix-toggle-discussion-link-jump' into 'master' Jacob Schatz2017-03-2814-12/+55
|\ \ \ \
| * | | | Fix link togglers jumping to topEric Eastwood2017-03-2814-12/+55
* | | | | Merge branch 'tc-api-remove-comments-endpoint' into 'master' Rémy Coutable2017-03-287-148/+68
|\ \ \ \ \
| * | | | | API: Make the /notes endpoint work with noteable iid instead of idToon Claes2017-03-275-55/+68
| * | | | | Remove `:id/merge_requests/:merge_request_iid/comments` endpointsToon Claes2017-03-272-93/+0
* | | | | | Merge branch '5983-poll-changes' into 'master' Jacob Schatz2017-03-282-14/+81
|\ \ \ \ \ \
| * | | | | | Parses string header into a numberFilipa Lacerda2017-03-281-1/+1
| * | | | | | Changes after reviewFilipa Lacerda2017-03-241-7/+9
| * | | | | | Adds restart method and auxiliar callback to polling classFilipa Lacerda2017-03-242-10/+75
* | | | | | | Merge branch 'calendar-tooltips' into 'master' Rémy Coutable2017-03-282-2/+6
|\ \ \ \ \ \ \
| * | | | | | | Add tooltip to user's calendar activitiesalex argunov2017-03-222-2/+6
* | | | | | | | Merge branch 'issuable-sidebar-collapsed-labels-icon' into 'master' Filipa Lacerda2017-03-282-1/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed labels icon being hidden in collapsed issuable sidebarPhil Hughes2017-03-282-1/+7
|/ / / / / / / /
* | | | | | | | Merge branch '30098-banzai-filter-mergerequestreferencefilter-has-an-n-1-quer...Yorick Peterse2017-03-284-2/+57
|\ \ \ \ \ \ \ \
| * | | | | | | | Add changelog entryRémy Coutable2017-03-281-0/+4
| * | | | | | | | Get rid of a third N+1 query problemRémy Coutable2017-03-281-1/+3
| * | | | | | | | Get rid of second N+1 query problemRémy Coutable2017-03-281-0/+4
| * | | | | | | | Get rid of a first N+1 query problemRémy Coutable2017-03-281-2/+21