summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | Correct the logo ID namesRobert Speicher2016-01-041-4/+4
| * | | | | | | Ensure the sweep always starts from the leftRobert Speicher2016-01-021-8/+9
| * | | | | | | Use the logo as a loading indicatorRobert Speicher2016-01-022-1/+46
* | | | | | | | Remove jquery.blockUI.js pluginrs-remove-jquery-blockuiRobert Speicher2016-01-042-8/+0
| |_|/ / / / / |/| | | | | |
* | | | | | | Revert "Merge branch 'rs-remove-jquery-blockui' into 'master' "reverting-rs-remove-jquery-blockuiJacob Schatz2016-01-041-0/+1
* | | | | | | Merge branch 'rs-remove-jquery-blockui' into 'master' Dmitriy Zaporozhets2016-01-041-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove jquery.blockUI.js pluginRobert Speicher2016-01-011-1/+0
| |/ / / / / /
* | | | | | | Merge branch 'rs-remove-jquery-history-js' into 'master' Dmitriy Zaporozhets2016-01-043-5/+4
|\ \ \ \ \ \ \
| * | | | | | | Remove jquery.history.js pluginrs-remove-jquery-history-jsRobert Speicher2016-01-013-5/+4
| |/ / / / / /
* | | | | | | Update cal-heatmap style overridesrs-bump-cal-heatmapRobert Speicher2016-01-011-36/+6
* | | | | | | Reorder JS requiresRobert Speicher2016-01-011-2/+2
* | | | | | | Remove unused "options" object from Calendar JSRobert Speicher2016-01-011-5/+0
|/ / / / / /
* | | | | | Merge branch 'fix-user-autocomplete' into 'master' Robert Speicher2015-12-301-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix user autocomplete uriIgor Matsko2015-12-261-1/+1
* | | | | | Merge branch 'rs-fix-shortcut-help' into 'master' Dmitriy Zaporozhets2015-12-282-4/+8
|\ \ \ \ \ \
| * | | | | | Fix the "Show all" link for the keyboard shortcut modalrs-fix-shortcut-helpRobert Speicher2015-12-272-4/+8
| |/ / / / /
* | | | | | Do not show frequently used emojis when emptyValery Sizov2015-12-281-6/+7
|/ / / / /
* | | | | Merge branch 'close-open-ajax-issue' into 'master' Robert Speicher2015-12-251-1/+33
|\ \ \ \ \
| * | | | | removes unused `alert` from issue spec. Requires flash in the *implementation...close-open-ajax-issueJacob Schatz2015-12-231-0/+1
| * | | | | adds test for issue close/reopen failureJacob Schatz2015-12-231-2/+3
| * | | | | resolves conflicts with new buttonsJacob Schatz2015-12-2319-92/+1454
| |\ \ \ \ \
| * | | | | | changes `issue-box` to `status-box` since html was changed as wellJacob Schatz2015-12-211-9/+9
| * | | | | | adds alerts for when http request errors out in some way.Jacob Schatz2015-12-211-0/+2
| * | | | | | removes console logsJacob Schatz2015-12-211-1/+0
| * | | | | | changes `data-url` to `href` for javascript url grabbingJacob Schatz2015-12-211-1/+2
| * | | | | | removes `console.log`sJacob Schatz2015-12-211-2/+0
| * | | | | | open and close issue via ajax request. With testsJacob Schatz2015-12-211-0/+30
* | | | | | | Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets2015-12-251-7/+8
|\ \ \ \ \ \ \
| * | | | | | | revert back vote buttons to issue and MR pagesValery Sizov2015-12-251-7/+8
* | | | | | | | Merge branch 'rs-opengraph' into 'master' Douwe Maan2015-12-252-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add gitlab_logo.png, remove brand_logo.pngRobert Speicher2015-12-232-0/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'emoji_picker_frequently_used' into 'master' Valery Sizov2015-12-241-1/+27
|\ \ \ \ \ \ \
| * | | | | | | added default for frequently used emojisValery Sizov2015-12-241-7/+9
| * | | | | | | fix of frequently used emojisValery Sizov2015-12-241-3/+3
| * | | | | | | Merge branch 'emoji-picker-search' into emoji_picker_frequently_usedValery Sizov2015-12-248-10/+90
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'emoji-picker-search'into emoji_picker_frequently_usedemoji_picker_frequently_usedValery Sizov2015-12-2428-130/+224
| |\ \ \ \ \ \ \ \
| * | | | | | | | | add frequently used category to emoji pickerValery Sizov2015-12-221-0/+26