summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Revert sidebar position for issue and merge requestDmitriy Zaporozhets2015-12-173-17/+3
* Fix ux issue with "This issue will be closed automatically" messageux/closed-messageDmitriy Zaporozhets2015-12-171-5/+0
* Merge remote-tracking branch 'origin/rs-simplify-status-icon'Dmitriy Zaporozhets2015-12-161-0/+17
|\
| * Define CI status icon colors in SCSS instead of a helperrs-simplify-status-iconRobert Speicher2015-12-121-0/+17
* | Merge branch 'fix-milestone-snippet-header' into 'master' Dmitriy Zaporozhets2015-12-166-46/+47
|\ \
| * | Rename .issuable-details to .detail-page (and -header and -description)Douwe Maan2015-12-166-46/+47
* | | Merge branch 'control-list-right-margin' into 'master' Dmitriy Zaporozhets2015-12-161-1/+5
|\ \ \
| * | | Fix right margin of control listDouwe Maan2015-12-161-1/+5
| |/ /
* | | Fix double border in MR discussionDmitriy Zaporozhets2015-12-164-4/+9
|/ /
* | Merge branch 'rs-clipboard-fixes' into 'master' Douwe Maan2015-12-161-1/+1
|\ \
| * | Fix clipboard buttons on MR instructions and Commit#showrs-clipboard-fixesRobert Speicher2015-12-151-1/+1
* | | Merge branch 'fix-profile-nav' into 'master' Andrey2015-12-161-0/+5
|\ \ \ | |/ / |/| |
| * | Make profile navigation full widefix-profile-navDmitriy Zaporozhets2015-12-111-0/+5
| |/
* | Merge branch 'wider-layout' into 'master' Andrey2015-12-151-1/+1
|\ \
| * | Increase fixed layout width to 1280pxwider-layoutDmitriy Zaporozhets2015-12-111-1/+1
| |/
* | Fix inline panel heading heightDouwe Maan2015-12-151-1/+4
* | 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