summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Fix regression where cmd-click stopped working for todos and merge request tabs27922-cmd-click-todo-doesn-t-workClement Ho2017-02-152-12/+10
* Merge branch 'use-es6-promise-package' into 'master' Alfredo Sumaran2017-02-141-2/+1
|\
| * Use es6-promise package to avoid webpack warningsuse-es6-promise-packageEric Eastwood2017-02-131-2/+1
* | Merge branch '27932-merge-request-pipelines-displays-json' into 'master' Alfredo Sumaran2017-02-141-1/+16
|\ \
| * \ Merge branch 'master' into 27932-merge-request-pipelines-displays-json27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-106-141/+38
| |\ \
| * | | Adds verification in case the endpoint already has `.json`Filipa Lacerda2017-02-101-2/+17
| * | | Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-106-35/+137
| |\ \ \
| * \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-101-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1016-68/+109
| |\ \ \ \ \
| * | | | | | Adds `.json` to the endpoint requested in order to avoid showing JSONFilipa Lacerda2017-02-091-1/+1
* | | | | | | Merge branch '27924-set-max-width-mini-pipeline-text' into 'master' Filipa Lacerda2017-02-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Set max width for text in mini pipeline graph27924-set-max-width-mini-pipeline-textSam Rose2017-02-141-1/+1
* | | | | | | | Merge branch '27966-branch-ref-switcher-input-filter-broken' into 'master' Filipa Lacerda2017-02-141-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Display loading indicator when filtering ref switcher dropdownClement Ho2017-02-131-0/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '22818-licence-gitignore-and-yml-endpoints-removal' into 'master' Rémy Coutable2017-02-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove deprecated templates endpoints in V422818-licence-gitignore-and-yml-endpoints-removalOswaldo Ferreira2017-02-131-1/+1
* | | | | | | | Merge branch 'option-to-be-notified-of-own-activity' into 'master' Douwe Maan2017-02-131-0/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add checkbox in UI to opt into receiving notifications about your activityRichard Macklin2017-02-011-0/+1
* | | | | | | | Merge branch '23535-folders-in-wiki-repository' into 'master' Douwe Maan2017-02-131-0/+30
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into 23535-folders-in-wiki-repositoryAlex Braha Stoll2017-01-29289-1892/+6293
| |\ \ \ \ \ \ \
| * | | | | | | | Add a breadcrumb at projects/wikis/show.html.hamlAlex Braha Stoll2016-12-311-0/+5
| * | | | | | | | Stop rendering page full path at projects/wikis/show.html.hamlAlex Braha Stoll2016-12-311-1/+0
| * | | | | | | | Fix scss style violationAlex Braha Stoll2016-12-311-1/+2
| * | | | | | | | Improve style of wiki page listsAlex Braha Stoll2016-12-311-0/+16
| * | | | | | | | Add tip about specifying the full path when creating new wiki pagesAlex Braha Stoll2016-12-311-0/+8
| * | | | | | | | Add component to show the full path of a wiki page when viewing its contentAlex Braha Stoll2016-12-311-1/+2
* | | | | | | | | Merge branch '28034-icon-in-issue-search-dropdown-still-animates' into 'master'Annabel Dunstone Gray2017-02-132-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Disable animation on avatars inside filter dropdowns28034-icon-in-issue-search-dropdown-still-animatesAlfredo Sumaran2017-02-101-0/+2
| * | | | | | | | | Remove animation for icons on filter dropdownAlfredo Sumaran2017-02-101-2/+1
* | | | | | | | | | Merge branch '27947-missing-margin-between-loading-icon-and-text-in-merge-req...Annabel Dunstone Gray2017-02-131-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add margin to loading icon in Merge Request Widget27947-missing-margin-between-loading-icon-and-text-in-merge-request-widgetSam Rose2017-02-101-2/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'fix/cycle-analytics-events-limit' into 'master' Sean McGivern2017-02-132-1/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix display logic for warning messagefix/cycle-analytics-events-limitSam Rose2017-02-082-4/+4
| * | | | | | | | | | Revise tooltip message and warning textSam Rose2017-02-071-4/+5
| * | | | | | | | | | Display number of shown events on Plan stage of Cycle AnalyticsSam Rose2017-02-072-1/+10
* | | | | | | | | | | Fixes markdown in activity feed is light gray27608-fixes-markdown-in-activity-feed-is-light-grayNur Rony2017-02-131-1/+0
* | | | | | | | | | | Merge branch '28029-improve-blockquote-formatting-on-emails' into 'master'Annabel Dunstone Gray2017-02-111-0/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Stylize blockquote in notification emailsAlfredo Sumaran2017-02-101-0/+7
* | | | | | | | | | | | Merge branch 'clean-javascript-vendor-files' into 'master' Filipa Lacerda2017-02-115-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | convert js-cookie dependency to an npm moduleclean-javascript-vendor-filesMike Greiling2017-02-113-3/+3
| * | | | | | | | | | | convert timeago.js dependency to an npm moduleMike Greiling2017-02-112-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch '27994-fix-mr-widget-jump' into 'master' Filipa Lacerda2017-02-101-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into 27994-fix-mr-widget-jumpFilipa Lacerda2017-02-103-12/+11
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | fixes MR widget jumpNur Rony2017-02-101-4/+4
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Add js prefix to right sidebarAnnabel Dunstone Gray2017-02-102-2/+5
* | | | | | | | | | Replace accidentally deleted metaclickAnnabel Dunstone Gray2017-02-101-0/+8
* | | | | | | | | | Remove right padding from navbar-collapse on large screensAnnabel Dunstone Gray2017-02-101-0/+4
* | | | | | | | | | common_utils merge conflictsAnnabel Dunstone Gray2017-02-101-3/+1
* | | | | | | | | | Set sidebar height to 100% if at top of pageAnnabel Dunstone Gray2017-02-101-0/+2
* | | | | | | | | | Set height of fixed sidebars with jsAnnabel Dunstone Gray2017-02-102-1/+11