summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix nav_link support for several path optionsDmitriy Zaporozhets2014-12-252-20/+35
* Merge branch 'master' into oauth2_providerDmitriy Zaporozhets2014-12-2524-223/+374
|\
| * Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2014-12-2515-159/+206
| |\
| | * Align sidebar navigation differentlyDmitriy Zaporozhets2014-12-251-2/+3
| | * Fix testsDmitriy Zaporozhets2014-12-253-5/+9
| | * Small UI imporovement for merge request accept widget and projects pageDmitriy Zaporozhets2014-12-252-6/+7
| | * Merge branch 'master' into ui-improvementsDmitriy Zaporozhets2014-12-258-63/+162
| | |\ | | |/ | |/|
| * | Merge branch 'fold-sidenav' into 'master'Dmitriy Zaporozhets2014-12-258-63/+162
| |\ \
| | * | Fold sidebar for mobile devices and expand for desktopDmitriy Zaporozhets2014-12-257-42/+94
| | * | fold-subnav class for folded sidebar navigation. Dashboard and project nav ad...Dmitriy Zaporozhets2014-12-244-22/+69
| |/ /
| | * Improve issue/mr page for tabletsDmitriy Zaporozhets2014-12-253-11/+13
| | * Set of UI changes mostly for issue and merge requestDmitriy Zaporozhets2014-12-2511-140/+179
| |/
| * Fix layout if broadcast message enabledDmitriy Zaporozhets2014-12-241-0/+4
| * Hide rack profiler by defaultDmitriy Zaporozhets2014-12-241-0/+1
* | Fix tests and add message if no oauth appsDmitriy Zaporozhets2014-12-254-19/+27
* | Rework oauth2 featureDmitriy Zaporozhets2014-12-2514-73/+114
* | Improve code styleDmitriy Zaporozhets2014-12-253-11/+18
* | convert erb to hamlValery Sizov2014-12-244-57/+37
* | Doorkeeper integrationValery Sizov2014-12-2436-3/+900
|/
* Merge branch 'project-path' into 'master'Dmitriy Zaporozhets2014-12-2411-47/+46
|\
| * Fix testDmitriy Zaporozhets2014-12-221-2/+0
| * For API compatibility still generate path from name if only name providedDmitriy Zaporozhets2014-12-221-1/+8
| * Fix spinach testDmitriy Zaporozhets2014-12-221-1/+1
| * Allow Group path to be changed at the same time as nameDmitriy Zaporozhets2014-12-224-13/+10
| * Set group name from path in admin controllerDmitriy Zaporozhets2014-12-221-1/+1
| * Set group path during creationDmitriy Zaporozhets2014-12-224-6/+18
| * Set project path & name in one field without transforamtionDmitriy Zaporozhets2014-12-222-24/+9
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-12-241-2/+2
|\ \
| * \ Merge pull request #8362 from bbodenmiller/patch-3Jeroen van Baarsen2014-12-231-2/+2
| |\ \
| | * | add missing password prompt to mysqldumpBen Bodenmiller2014-11-201-2/+2
* | | | Merge branch 'sidebar-nav' into 'master'Dmitriy Zaporozhets2014-12-2490-1161/+918
|\ \ \ \
| * | | | Fix spinach testssidebar-navDmitriy Zaporozhets2014-12-241-4/+0
| * | | | Fix diff commentsDmitriy Zaporozhets2014-12-241-1/+1
| * | | | Fix scroll problems and disable authorized_only filterDmitriy Zaporozhets2014-12-244-10/+15
| * | | | Improvements to issues/mr filters:Dmitriy Zaporozhets2014-12-243-12/+18
| * | | | Refactor issuable list pagesDmitriy Zaporozhets2014-12-245-28/+33
| * | | | Refactor issues and merge requests listsDmitriy Zaporozhets2014-12-2320-210/+140
| * | | | One column issue/mr lists for projectDmitriy Zaporozhets2014-12-236-114/+59
| * | | | Show issuable context labels as blocksDmitriy Zaporozhets2014-12-232-4/+4
| * | | | Render MR diff full size of screenDmitriy Zaporozhets2014-12-224-38/+46
| * | | | Fix testsDmitriy Zaporozhets2014-12-221-2/+1
| * | | | Fix issueable context update and fix testsDmitriy Zaporozhets2014-12-229-20/+16
| * | | | Merge branch 'master' into sidebar-navDmitriy Zaporozhets2014-12-2178-402/+666
| |\ \ \ \
| * | | | | Css/views cleanup after layout restyleDmitriy Zaporozhets2014-12-2125-274/+60
| * | | | | Admin area using side navDmitriy Zaporozhets2014-12-212-8/+11
| * | | | | Restyle issue/mr/milestone to new layoutDmitriy Zaporozhets2014-12-1810-380/+256
| * | | | | Improve sidenav colorsDmitriy Zaporozhets2014-12-171-3/+7
| * | | | | Sidenav for profile areaDmitriy Zaporozhets2014-12-173-15/+35
| * | | | | Migrate public layouts to new designDmitriy Zaporozhets2014-12-175-16/+28
| * | | | | Dashboard layout uses sidenavDmitriy Zaporozhets2014-12-175-33/+31
View Lorry Controller Status