summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'comment-text-remains-in-text-box-after-submitting-it' into 'mas...Dmitriy Zaporozhets2016-01-181-1/+1
|\
| * Fixes issue where firefox does not delete message after comment submitcomment-text-remains-in-text-box-after-submitting-itJacob Schatz2016-01-151-1/+1
* | Merge branch 'issue-page-keeps-jumping-up' into 'master' Dmitriy Zaporozhets2016-01-172-1/+31
|\ \
| * | fixes scrollbar jump by making discussion the same size as the sidebar when s...issue-page-keeps-jumping-upJacob Schatz2016-01-133-12/+35
| * | initial fixJacob Schatz2016-01-133-5/+12
* | | Autosize the textarea in showEditFormRobert Speicher2016-01-161-0/+1
| |/ |/|
* | Fix javascript error with deleting messages in issue or merge requestdeleting-a-note-after-editing-another-results-in-a-javascript-errorJacob Schatz2016-01-141-4/+5
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-01-141-12/+13
|\ \
| * | Move js function to removing accents to vendor/assets/javascriptsDouglas Barbosa Alexandre2016-01-141-7/+3
| * | Relax constraints for wiki slugDouglas Barbosa Alexandre2016-01-141-12/+17
* | | Merge remote-tracking branch 'origin/rs-autosize'Dmitriy Zaporozhets2016-01-142-0/+6
|\ \ \ | |/ / |/| |
| * | Fix missing autosize requirers-autosizeRobert Speicher2016-01-131-0/+1
| * | Autosize textareasRobert Speicher2016-01-132-0/+5
| |/
* | Merge branch 'closing-mr-bug-fix' into 'master' Dmitriy Zaporozhets2016-01-142-6/+11
|\ \
| * | fixes bug with commenting on merge requestsclosing-mr-bug-fixJacob Schatz2016-01-132-6/+11
| |/
* | Merge branch 'remove-gray-bg'Dmitriy Zaporozhets2016-01-142-3/+3
|\ \
| * | Use closest instead of parent()Dmitriy Zaporozhets2016-01-131-1/+1
| * | Replace nav-tabs with nav-linksDmitriy Zaporozhets2016-01-131-1/+1
| * | New layout without background colorDmitriy Zaporozhets2016-01-131-2/+2
| |/
* | Simplify broadcast message JSRobert Speicher2016-01-131-3/+4
* | Move broadcast message form to a partialRobert Speicher2016-01-131-2/+1
|/
* 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-1115-120/+298
| |\
| * | 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
* | | Call clearInterval for the currentTimer if one existsRobert Speicher2016-01-111-0/+1
| |/ |/|
* | Merge branch 'rs-zenmode-cleanup' into 'master' Douwe Maan2016-01-111-40/+64
|\ \
| * | Refactor ZenModers-zenmode-cleanupRobert Speicher2016-01-081-40/+64
* | | 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 'api-project-upload' into 'master' Robert Speicher2016-01-081-12/+2
|\ \ \ | |/ / |/| |
| * | Add API project upload endpointDouwe Maan2016-01-071-12/+2
* | | Use fadeTo instead of cssajax-filter-commitsDmitriy Zaporozhets2016-01-071-5/+2
* | | Fix typo in js method and some repeating cssDmitriy Zaporozhets2016-01-071-3/+3
* | | Prevent loading first 20 commits twiceDmitriy Zaporozhets2016-01-071-3/+3
* | | Add ajax filtering for commits listDmitriy Zaporozhets2016-01-071-40/+27
* | | 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-075-1/+152
|/ /
* | Merge branch 'rs-logo-animation' into 'master' Dmitriy Zaporozhets2016-01-051-0/+43
|\ \
| * | 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