summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master' Dmitriy Zaporozhets2016-01-133-15/+33
|\
| * gets merge request discussion working againcomment-and-close-button-does-not-submit-commentJacob Schatz2016-01-122-2/+22
| * adds back in discussion.haml.html for issues commenting and closing/reopening...Jacob Schatz2016-01-121-0/+2
| * reverting MR ajax changes, which will be in a different MRJacob Schatz2016-01-121-3/+2
| * restores merge request coffee fileJacob Schatz2016-01-121-49/+0
| * fixes conflictsJacob Schatz2016-01-1158-234/+449
| |\
| * | initial json requests instead of HTMLJacob Schatz2016-01-072-2/+9
| * | adds ajax open and close merges, with discussion/comments working as wellJacob Schatz2016-01-051-0/+43
| * | removes commented out code.Jacob Schatz2015-12-301-2/+0
| * | adds ajax to bottom discussion buttons. Now submits issue and closes via ajax.Jacob Schatz2015-12-292-15/+13
* | | Merge branch 'active-state-on-button-makes-it-uppercase' into 'master' Dmitriy Zaporozhets2016-01-121-3/+2
|\ \ \
| * | | changes bolded on active for dropdowns, sitewide.active-state-on-button-makes-it-uppercaseJacob Schatz2016-01-111-3/+2
| | |/ | |/|
* | | Call clearInterval for the currentTimer if one existsRobert Speicher2016-01-111-0/+1
|/ /
* | Merge branch 'rs-woff-fonts' into 'master' Dmitriy Zaporozhets2016-01-1132-7/+8
|\ \
| * | Use WOFF versions of SourceSansPrors-woff-fontsRobert Speicher2016-01-0932-7/+8
* | | Merge branch 'rs-zenmode-cleanup' into 'master' Douwe Maan2016-01-112-102/+101
|\ \ \
| * | | Refactor ZenModers-zenmode-cleanupRobert Speicher2016-01-082-102/+101
| |/ /
* | | Only load autocomplete data when actually neededYorick Peterse2016-01-111-9/+10
* | | Merge branch 'autocomplete-on-load' into 'master' Dmitriy Zaporozhets2016-01-111-13/+12
|\ \ \
| * | | Load autocomplete data when loading an issue pageautocomplete-on-loadYorick Peterse2016-01-081-13/+12
* | | | Merge branch 'new-branch-position-fix' into 'master' Dmitriy Zaporozhets2016-01-111-1/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | fixes new branch button positioning, when visible and not visible containernew-branch-position-fixJacob Schatz2016-01-081-1/+6
| |/ /
* | | Merge branch 'api-project-upload' into 'master' Robert Speicher2016-01-081-12/+2
|\ \ \ | |/ / |/| |
| * | Add API project upload endpointDouwe Maan2016-01-071-12/+2
* | | Merge branch 'cross-project-reference-move' into 'master' Dmitriy Zaporozhets2016-01-081-1/+9
|\ \ \
| * | | adds 85% width for textcross-project-reference-moveJacob Schatz2016-01-071-1/+1
| * | | adds reference to the bottom of sidebarJacob Schatz2016-01-071-1/+9
* | | | css change to height to make gray container fitbanner-out-of-placeJacob Schatz2016-01-072-0/+2
|/ / /
* | | Use fadeTo instead of cssajax-filter-commitsDmitriy Zaporozhets2016-01-071-5/+2
* | | Fix typo in js method and some repeating cssDmitriy Zaporozhets2016-01-072-3/+12
* | | Prevent loading first 20 commits twiceDmitriy Zaporozhets2016-01-071-3/+3
* | | Add ajax filtering for commits listDmitriy Zaporozhets2016-01-071-40/+27
* | | Add search field to commits pageDmitriy Zaporozhets2016-01-071-7/+3
* | | Merge branch 'fix-missing-day-in-network-graph' into 'master' Dmitriy Zaporozhets2016-01-071-1/+1
|\ \ \ | |/ / |/| |
| * | Fix missing date of month in network graph when commits span a monthStan Hu2016-01-061-1/+1
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-076-1/+160
* | | Enable Microsoft Azure OAuth2 supportJanis Meybohm2016-01-061-0/+0
|/ /
* | Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' Douwe Maan2016-01-051-0/+56
|\ \
| * \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-0340-295/+525
| |\ \
| * \ \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-1221-23/+148
| |\ \ \
| * \ \ \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-022-8/+8
| |\ \ \ \
| * | | | | Add graphs showing commits ahead and behind default to branches pageJeff Stubler2015-11-011-0/+59
* | | | | | Merge branch 'new-markdown' into 'master' Dmitriy Zaporozhets2016-01-051-3/+3
|\ \ \ \ \ \
| * | | | | | markdown fixesnew-markdownAndriy Dyadyura2016-01-051-1/+1
| * | | | | | markdown fixesAndriy Dyadyura2016-01-051-3/+3
* | | | | | | Merge branch 'improved-leave-project' into 'master' Dmitriy Zaporozhets2016-01-051-0/+7
|\ \ \ \ \ \ \
| * | | | | | | adds settings menu to the top for editting and leaving projectsJacob Schatz2015-12-281-0/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'rs-logo-animation' into 'master' Dmitriy Zaporozhets2016-01-052-1/+44
|\ \ \ \ \ \ \
| * | | | | | | Restructure logo JS to use `setInterval`rs-logo-animationRobert Speicher2016-01-041-25/+21
| * | | | | | | Decrease the logo sweep delayRobert Speicher2016-01-041-2/+3
View Lorry Controller Status