summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '27934-left-align-logo' into 'master' Dmitriy Zaporozhets2017-02-281-22/+11
|\
| * Left align logo; increase max width of title27934-left-align-logoAnnabel Dunstone Gray2017-02-281-22/+11
* | Remove hidden-xs classes from last columns in environments and pipelines table.28661-ci-tables-buttonsFilipa Lacerda2017-02-287-113/+97
|/
* Merge branch '28723-consistent-handling-indexof' into 'master' Clement Ho2017-02-276-9/+9
|\
| * Keep consistent in handling indexOf resultsTakuya Noguchi2017-02-256-9/+9
* | Merge branch '28212-avoid-dos-on-build-trace' into 'master' Clement Ho2017-02-271-13/+20
|\ \
| * | Replace setInterval with setTimeout to prevent highly frequent requestsTakuya Noguchi2017-02-251-13/+20
| |/
* | Merge branch '27840-improve-search-bar-experience' into 'master' Annabel Dunstone Gray2017-02-272-2/+50
|\ \
| * | Fix #27840 - Improve the search bar experience on mobilePratik Borsadiya2017-02-242-2/+50
* | | Merge branch 'remove-jquery-ui-draggable' into 'master' Jacob Schatz2017-02-272-25/+58
|\ \ \
| * | | Removed jQuery UI draggableremove-jquery-ui-draggablePhil Hughes2017-02-272-25/+58
* | | | Merge branch '28753-align-buttons-environments' into 'master' Annabel Dunstone Gray2017-02-272-26/+28
|\ \ \ \
| * | | | Align last column buttons with new environment button28753-align-buttons-environmentsFilipa Lacerda2017-02-272-26/+28
| |/ / /
* | | | Merge branch 'ssh-key-paste' into 'master' Filipa Lacerda2017-02-271-3/+4
|\ \ \ \
| * | | | Updates SSH key title after pasting keyPhil Hughes2017-02-271-3/+4
* | | | | Merge branch 'rss-btn-alignment-fix' into 'master' Annabel Dunstone Gray2017-02-272-9/+1
|\ \ \ \ \
| * | | | | Fixed alignment of RSS button on activity pagesrss-btn-alignment-fixPhil Hughes2017-02-232-9/+1
* | | | | | Merge branch 'mr-diff-comment-button' into 'master' Annabel Dunstone Gray2017-02-278-68/+125
|\ \ \ \ \ \
| * | | | | | Removed link transitionmr-diff-comment-buttonPhil Hughes2017-02-276-5/+14
| * | | | | | Changed dark hover backgroundPhil Hughes2017-02-271-1/+1
| * | | | | | Moved color values into variablesPhil Hughes2017-02-275-15/+20
| * | | | | | Grow the button on hoverPhil Hughes2017-02-272-15/+15
| * | | | | | Improved the diff comment button UXPhil Hughes2017-02-278-59/+102
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ci-tables-ui-improvements' into 'master' Annabel Dunstone Gray2017-02-273-175/+114
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into ci-tables-ui-improvementsci-tables-ui-improvementsFilipa Lacerda2017-02-2730-671/+1036
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Guarantees we show at least 4 stages in line in smaller screensFilipa Lacerda2017-02-231-0/+1
| * | | | | | Aligns text content instead of divFilipa Lacerda2017-02-232-106/+82
| * | | | | | Merge branch 'master' into ci-tables-ui-improvementsFilipa Lacerda2017-02-2322-121/+233
| |\ \ \ \ \ \
| * | | | | | | Guarantees buttons will always stay in the same lineFilipa Lacerda2017-02-231-1/+2
| * | | | | | | Fix btn group not having round corners when there's only some buttons presentFilipa Lacerda2017-02-231-19/+10
| * | | | | | | Equal padding between table cellsFilipa Lacerda2017-02-222-51/+22
| * | | | | | | Fix scss linter errorFilipa Lacerda2017-02-221-2/+2
| * | | | | | | Improvements in spacingFilipa Lacerda2017-02-221-4/+7
| * | | | | | | Remove unused css, align buttons with top buttonFilipa Lacerda2017-02-221-21/+15
| * | | | | | | Convert button into a btn group according to mockupsFilipa Lacerda2017-02-221-29/+32
* | | | | | | | Merge branch 'issue_24815' into 'master' Sean McGivern2017-02-271-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix issuable stale object error handler for js when updating tasklistsissue_24815Felipe Artur2017-02-241-0/+12
* | | | | | | | | Merge branch 'improve-backoff-algo' into 'master' Fatih Acet2017-02-271-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improves backoff algo with maxInterval between requestsFilipa Lacerda2017-02-271-3/+4
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Backport EE http status codes new file to CEFilipa Lacerda2017-02-271-0/+10
|/ / / / / / / /
* | | | | | | | Merge branch 'backoff-algo-backport-ee' into 'master' Jacob Schatz2017-02-261-0/+52
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Adds backoff algo from EE to CEbackoff-algo-backport-eeFilipa Lacerda2017-02-241-0/+52
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '28419-ask-confirmation-cancel' into 'master' Fatih Acet2017-02-241-1/+16
|\ \ \ \ \ \ \
| * | | | | | | Adds confirmation for cancel button28419-ask-confirmation-cancelFilipa Lacerda2017-02-241-1/+16
* | | | | | | | Merge branch 'moving-issue-with-two-list-labels' into 'master' Alfredo Sumaran2017-02-242-5/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Removes label from previous listmoving-issue-with-two-list-labelsPhil Hughes2017-02-212-5/+12
* | | | | | | | | Merge branch 'remove-require-context-application-bundle' into 'master' Alfredo Sumaran2017-02-241-11/+170
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add missing require statement and don't require selfremove-require-context-application-bundleMike Greiling2017-02-231-1/+1
| * | | | | | | | | remove require.context from application.jsMike Greiling2017-02-231-11/+170
* | | | | | | | | | Merge branch 'user-callouts' into 'master' Filipa Lacerda2017-02-243-0/+101
|\ \ \ \ \ \ \ \ \ \