summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statusesGreg Smethells2015-12-111-0/+20
* 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
| | * | | | | Use consistent padding in panel headingDouwe Maan2015-12-081-2/+4
| | * | | | | Allow center top menu to span multiple linesDouwe Maan2015-12-083-11/+9
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'fix-broken-group-avatar-upload' into 'master' Dmitriy Zaporozhets2015-12-081-1/+1
| |\ \ \ \ \
| | * | | | | Fix broken group avatar uploadStan Hu2015-12-081-1/+1
| | |/ / / /
| * | | | | Merge branch 'master' into ui/dashboard-new-issueui/dashboard-new-issueDouwe Maan2015-12-081-2/+2
| |\ \ \ \ \ | | |/ / / /
| * | | | | Include groups in dashboard "New Milestone" select.Douwe Maan2015-12-071-6/+19
| * | | | | Merge branch 'master' into ui/dashboard-new-issueDouwe Maan2015-12-0724-171/+262
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Use select2 dropdown for dashboard/group 'New X' buttonsDouwe Maan2015-12-073-0/+70
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-085-14/+37
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix random failing test - delete attachmentfix-random-testDmitriy Zaporozhets2015-12-071-2/+2
| | |/ / | |/| |
| * | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' Grzegorz Bizon2015-12-074-7/+33
| |\ \ \