summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'relative-url-assets' into 'master' Jacob Schatz2017-01-273-2/+28
|\
| * update scripts and docs to reference the newly namespaced rake taskrelative-url-assetsMike Greiling2017-01-271-1/+1
| * remove hard-coded assets path for ace editor modulesMike Greiling2017-01-272-1/+27
* | Merge branch 'issuable-sidebar-bug' into 'master' Alfredo Sumaran2017-01-272-9/+9
|\ \
| * | Moved the turbolinks listener from application.js to the corresponding issuab...Jose Ivan Vargas2017-01-252-8/+9
| * | Fixed Issuable sidebar so it remains closed on mobile/smaller screen devicesJose Ivan Vargas Lopez2017-01-251-9/+8
* | | Merge branch '27248-filtered-search-does-not-allow-filtering-labels-with-mult...Filipa Lacerda2017-01-271-2/+8
|\ \ \ | |_|/ |/| |
| * | Fix filtering with multiple words27248-filtered-search-does-not-allow-filtering-labels-with-multiple-wordsClement Ho2017-01-271-2/+8
* | | Merge branch '27280-fix-unititalized-constant' into 'master' Robert Speicher2017-01-271-44/+51
|\ \ \
| * | | Move ApplicationSetting DEFAULTS to `.defaults` insteadRémy Coutable2017-01-271-44/+48
| * | | Move a begin/rescue clause to ApplicationSetting.expireRémy Coutable2017-01-271-0/+3
* | | | Merge branch '26448-unnecessary-request-is-made-when-filter-input-box-is-focu...Fatih Acet2017-01-271-1/+7
|\ \ \ \
| * | | | Only search commits on input change since last search26448-unnecessary-request-is-made-when-filter-input-box-is-focused-by-keyboardSam Rose2017-01-251-1/+7
* | | | | Merge branch 'fix-search-bar-search-param' into 'master' Filipa Lacerda2017-01-271-1/+2
|\ \ \ \ \
| * | | | | Fix search bar search param encodingfix-search-bar-search-paramClement Ho2017-01-271-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'contribution-calendar-scroll' into 'master' Clement Ho2017-01-272-1/+2
|\ \ \ \ \
| * | | | | Added ltr direction for the calendar contribution month rowJose Ivan2017-01-261-2/+2
| * | | | | Reverted the change from .second-block to .calender-blockJose Ivan2017-01-253-2/+2
| * | | | | Contribution calendar now scrolls right by defaultJosé Iván2017-01-251-0/+1
* | | | | | Merge branch 'ui-updates' into 'master' Fatih Acet2017-01-274-7/+5
|\ \ \ \ \ \
| * | | | | | Add tooltip to subscribe btnui-updatesAnnabel Dunstone Gray2017-01-261-1/+1
| * | | | | | Speed up animation transition; add hover state to top right iconsAnnabel Dunstone Gray2017-01-243-5/+3
| * | | | | | Darken repo links on hover; fix clone input heightAnnabel Dunstone Gray2017-01-241-2/+2
* | | | | | | Merge branch 'fix-cancel-integration-settings' into 'master' Clement Ho2017-01-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed cancel button in the services form not redirecting back to the integrat...fix-cancel-integration-settingsJose Ivan Vargas2017-01-271-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '27259-label-for-references-the-wrong-associated-text-input' int...Annabel Dunstone Gray2017-01-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix project name label's for reference in project settings27259-label-for-references-the-wrong-associated-text-inputClement Ho2017-01-271-1/+1
* | | | | | | | Merge branch 'speed-up-members-dropdown' into 'master' Douwe Maan2017-01-271-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't call `#uniq` on a relationSean McGivern2017-01-271-3/+2
* | | | | | | | | Merge branch '26947-build-status-self-link' into 'master' Kamil Trzciński2017-01-272-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use badge partial as single source of truth instead of having 2 partials doin...26947-build-status-self-linkFilipa Lacerda2017-01-278-18/+16
| * | | | | | | | | Changes after reviewFilipa Lacerda2017-01-271-3/+1
| * | | | | | | | | Adds tests to build viewFilipa Lacerda2017-01-271-1/+1
| * | | | | | | | | Use new partial to render a badge without a link in the builds details. Preve...Filipa Lacerda2017-01-277-14/+19
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mr-tabs-container-offset' into 'master' Annabel Dunstone Gray2017-01-273-13/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed merge request tabs extra marginPhil Hughes2017-01-273-13/+20
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sh-fix-annotated-tags-pointing-to-blob' into 'master' Douwe Maan2017-01-271-1/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix Error 500 when repositories contain annotated tags pointing to blobssh-fix-annotated-tags-pointing-to-blobStan Hu2017-01-261-1/+12
* | | | | | | | | Merge branch '26943-fix-user-in-build-presenter' into 'master' Robert Speicher2017-01-272-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't override presentee methods for Gitlab::View::Presenter::DelegatedRémy Coutable2017-01-242-4/+4
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'issue_27211' into 'master'Rémy Coutable2017-01-271-6/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused js response from refs controllerissue_27211Felipe Artur2017-01-261-6/+0
* | | | | | | | | | Merge branch '26844-new-search-bar-performs-a-new-request-for-each-tag' into ...Alfredo Sumaran2017-01-272-39/+63
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add caching of droplab ajax requests26844-new-search-bar-performs-a-new-request-for-each-tagClement Ho2017-01-262-39/+63
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'revert-filter-assigned-to-me' into 'master' Filipa Lacerda2017-01-261-4/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Revert 3f17f29arevert-filter-assigned-to-meClement Ho2017-01-261-4/+0
* | | | | | | | | | Merge branch '27277-small-mini-pipeline-graph-glitch-upon-hover' into 'master' Filipa Lacerda2017-01-261-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixed small mini pipeline graph line glitchdimitrieh2017-01-261-2/+2
* | | | | | | | | | | Merge branch '27044-fix-explore-sorting-on-trending' into 'master' Fatih Acet2017-01-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix /explore sorting (trending)Eric Eastwood2017-01-261-0/+1
| | |/ / / / / / / / / | |/| | | | | | | | |