summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ability_to_cancel_attaching_file' into 'master' Douwe Maan2017-05-162-94/+201
|\
| * Add an ability to cancel attaching file and redesign attaching files UIblackst0ne2017-05-162-94/+201
* | Merge branch '32326-scrollable-tabs-overflow' into 'master' Annabel Dunstone Gray2017-05-162-2/+6
|\ \
| * | prevent dropdowns from being cut-off by scrollable tab container32326-scrollable-tabs-overflowSimon Knox2017-05-162-2/+6
* | | Make `gfm_auto_complete` into a module and fix up tech debtEric Eastwood2017-05-166-238/+256
|/ /
* | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' Douwe Maan2017-05-162-0/+18
|\ \
| * | Add test.js and test.css to disable animations during testing and include the...disable-css-and-jquery-animations-for-capybaraLuke "Jared" Bennett2017-05-152-0/+18
* | | Removes nicescroll from issuable sidebarPhil Hughes2017-05-163-13/+9
* | | Only renders empty state for pipelines table if no pipelines are received whe...Filipa Lacerda2017-05-162-16/+36
* | | Merge branch 'environments-button-open-same-tab' into 'master' Annabel Dunstone Gray2017-05-161-1/+0
|\ \ \
| * | | Removed the target=_blank from the monitoring componentenvironments-button-open-same-tabJose Ivan Vargas2017-05-151-1/+0
* | | | Merge branch 'add-right-margin-to-ci-error-icon' into 'master' Fatih Acet2017-05-162-1/+5
|\ \ \ \
| * | | | Added ci-error class and applied a right margin to the ci error widget stateadd-right-margin-to-ci-error-iconLuke "Jared" Bennett2017-05-132-1/+5
* | | | | Replace broken autocomplete field for new tags with dropdownWinnie Hellmann2017-05-163-44/+51
* | | | | Merge branch '32303-nav-z-index' into 'master' Fatih Acet2017-05-161-0/+1
|\ \ \ \ \
| * | | | | Add higher z-index to fixed nav32303-nav-z-indexAnnabel Dunstone Gray2017-05-151-0/+1
* | | | | | Merge branch '32125-fix-link-to-note-in-diff' into 'master' Fatih Acet2017-05-164-62/+91
|\ \ \ \ \ \
| * | | | | | Fix linking to resolved note in diff32125-fix-link-to-note-in-diffEric Eastwood2017-05-124-62/+91
* | | | | | | Merge branch '24373-warning-message-go-away' into 'master' Phil Hughes2017-05-161-3/+16
|\ \ \ \ \ \ \
| * | | | | | | Notes: Warning message should go away once resolvedJacopo2017-05-151-3/+16
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'issue-boards-label-filtering' into 'master' Filipa Lacerda2017-05-161-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Fixed tests with params being wrongissue-boards-label-filteringPhil Hughes2017-05-151-1/+4
| * | | | | | | Fixed issue boards not filtering when URL params are encodedPhil Hughes2017-05-121-1/+1
* | | | | | | | Merge branch '31898-pipeline-table-alignment' into 'master' Filipa Lacerda2017-05-161-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove extra pipeline margin31898-pipeline-table-alignmentAnnabel Dunstone Gray2017-05-101-2/+1
* | | | | | | | | Merge branch '31902-namespace-recent-searches-to-project' into 'master' Annabel Dunstone Gray2017-05-152-3/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Scope recent searches to projectEric Eastwood2017-05-152-3/+8
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '31106-tabs-alignment' into 'master' Annabel Dunstone Gray2017-05-154-20/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | fix Resolved Discussions counter wrapping to next lineSimon Knox2017-05-134-20/+41
* | | | | | | | | Improve slash command stripping, escape temporary note contentsKushal Pandya2017-05-151-2/+3
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge branch '32184-retried-jobs' into 'master' Phil Hughes2017-05-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use fa-refresh on retried jobs32184-retried-jobsAnnabel Dunstone Gray2017-05-121-1/+1
* | | | | | | | | Merge branch '31886-remover-comment-load-spinner' into 'master' Annabel Dunstone Gray2017-05-151-3/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 31886 Remove spinner from loading comment31886-remover-comment-load-spinnertauriedavis2017-05-121-3/+0
* | | | | | | | | | MR zindex regressionLuke "Jared" Bennett2017-05-153-2/+4
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Added balsamiq jasmine integration testLuke "Jared" Bennett2017-05-152-20/+36
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge branch '30975-fixed-top-nav-POC' into 'master' Annabel Dunstone Gray2017-05-127-5/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Clean up fixed navbarAnnabel Dunstone Gray2017-05-123-6/+9
| * | | | | | | | Fix specsAnnabel Dunstone Gray2017-05-122-3/+4
| * | | | | | | | Fade out border on scrollAnnabel Dunstone Gray2017-05-122-11/+12
| * | | | | | | | Add animation to navbar borderAnnabel Dunstone Gray2017-05-121-2/+3
| * | | | | | | | Add nav border on scrollAnnabel Dunstone Gray2017-05-122-0/+15
| * | | | | | | | Remove trailing semicolonAnnabel Dunstone Gray2017-05-121-1/+1
| * | | | | | | | Add fixed positioning to top level navbarAnnabel Dunstone Gray2017-05-125-3/+12
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dm-dependency-linker-gemfile' into 'master' Sean McGivern2017-05-125-0/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Turn blob dependency links blueDouwe Maan2017-05-105-0/+25
* | | | | | | | | Merge branch 'dm-copy-mr-source-branch-as-gfm' into 'master' Sean McGivern2017-05-121-1/+10
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 'dm-copy-mr-source-branch-as-gfm'dm-copy-mr-source-branch-as-gfmDouwe Maan2017-05-1254-1221/+1222
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Satisfy ESlintDouwe Maan2017-05-121-3/+4
| * | | | | | | | | Paste a copied MR source branch name as code when pasted into a GFM formDouwe Maan2017-05-111-1/+9