summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'improve_emoji'Valery Sizov2015-12-141-1/+20
|\
| * Add hover-state for emoji in emoji-pickerimprove_emojiValery Sizov2015-12-111-1/+20
* | Move awards back to gray panel and few improvements to sidebarDmitriy Zaporozhets2015-12-112-1/+1
* | Few UI improvements to new sidebar implementationDmitriy Zaporozhets2015-12-112-2/+7
* | Implement new sidebar for merge request pageDmitriy Zaporozhets2015-12-113-5/+7
* | Make edit link on issuable sidebar worksDmitriy Zaporozhets2015-12-111-2/+8
* | Redesign issue page for new sidebarDmitriy Zaporozhets2015-12-111-93/+59
* | Move awards css to separate fileDmitriy Zaporozhets2015-12-111-0/+68
* | Merge branch 'mr-statuses' into 'master' Robert Speicher2015-12-111-0/+20
|\ \
| * | display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statusesGreg Smethells2015-12-111-0/+20
* | | Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master'Robert Speicher2015-12-111-8/+16
|\ \ \ | |/ / |/| |
| * | Remove note from MR discussion when deleting it in the changes tabDouglas Barbosa Alexandre2015-12-101-8/+16
* | | Merge branch 'feature/project_js_from_ee' into 'master' Douwe Maan2015-12-111-2/+5
|\ \ \ | |_|/ |/| |
| * | Aling project js with EEBorja Aparicio2015-12-101-2/+5
* | | Fix award-emojis alert flash messageGrzegorz Bizon2015-12-113-13/+3
* | | emoji aliases problemValery Sizov2015-12-111-1/+6
| |/ |/|
* | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' Robert Speicher2015-12-102-8/+13
|\ \ | |/ |/|
| * Make selectors more specific when scroll to elementDouglas Barbosa Alexandre2015-12-101-1/+1
| * Make selectors more specific when setting the tab contentDouglas Barbosa Alexandre2015-12-101-3/+3
| * USe innerHtml to avoid slow performance on a MR with very large difffix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-101-3/+2
| * Merge branch 'master' into fix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-092-9/+11
| |\
| * | Ensure new notes are highlighted properly on a merge request diffDouglas Barbosa Alexandre2015-12-091-3/+7
| * | Ensure existing notes are highlighted properly on a merge request diffDouglas Barbosa Alexandre2015-12-091-1/+3
| * | Ensure notes are replaced on a merge request diff when they're updatedDouglas Barbosa Alexandre2015-12-091-1/+1
* | | Merge branch 'rs-snippets-clipboard'Douwe Maan2015-12-101-0/+6
|\ \ \
| * | | Add copy-to-clipboard button to Snippets#showrs-snippets-clipboardRobert Speicher2015-12-091-0/+6
| | |/ | |/|
* | | Fix list with controls displayDmitriy Zaporozhets2015-12-101-19/+25
* | | Merge remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-091-0/+18
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into mr-brokenDouwe Maan2015-12-0815-39/+110
| |\ \
| * | | Add indication to merge request list item that MR cannot be merged automaticallyDouwe Maan2015-12-081-0/+18
* | | | Merge branch 'rs-list-styling' into 'master' Dmitriy Zaporozhets2015-12-092-9/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | Improve styling for mixed list stylesrs-list-stylingRobert Speicher2015-12-082-9/+11
| | |/ | |/|
* | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-092-1/+25
|\ \ \
| * | | Move Builds tab to the endDouwe Maan2015-12-081-13/+13
| * | | Merge branch 'master' into mr-buildsDouwe Maan2015-12-0815-39/+110
| |\ \ \ | | |/ /
| * | | Change text of MR widget headingDouwe Maan2015-12-081-0/+4
| * | | Add Builds tab to MR detail pageDouwe Maan2015-12-081-1/+21
| | |/ | |/|
* | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-0815-39/+110
|\ \ \ | | |/ | |/|
| * | Merge branch 'ui-framework-fixes'Dmitriy Zaporozhets2015-12-083-12/+1
| |\ \
| | * | Small css cleanup and ui dev kit improvementsDmitriy Zaporozhets2015-12-023-12/+1
| * | | Merge remote-tracking branch 'origin/ui/misc'Dmitriy Zaporozhets2015-12-083-9/+8
| |\ \ \
| | * \ \ Merge branch 'master' into ui/miscui/miscDouwe Maan2015-12-081-2/+2
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Remove pointless explanation for user tabsDouwe Maan2015-12-071-3/+7
| | * | | Merge branch 'master' into ui/miscDouwe Maan2015-12-0724-171/+262
| | |\ \ \
| | * \ \ \ Merge branch 'master' into ui/miscDouwe Maan2015-12-0319-142/+99
| | |\ \ \ \
| | * | | | | "CI build passed", not "CI build success"Douwe Maan2015-12-021-6/+0
| | * | | | | Move "Start new merge request" checkbox closer to New branch fieldDouwe Maan2015-12-021-3/+3
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'build-related-fixes' into 'master' Dmitriy Zaporozhets2015-12-087-17/+17
| |\ \ \ \ \
| | * | | | | Render monospace text at 90% of the parent font-sizeDouwe Maan2015-12-082-1/+2
| | * | | | | Use consistent padding for .gitlab-ci.yml info calloutsDouwe Maan2015-12-081-3/+2