summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'solarized-dark-old-lines' into 'master' Robert Speicher2016-01-221-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Make deleted line background color for Solarized Dark a little darker The difference is very slight, and I don't even _use_ Solarized Dark, but this annoyed me. See merge request !2563
| * | Make old line background color for Solarized Dark a little more clearsolarized-dark-old-linesDouwe Maan2016-01-221-1/+1
| | |
* | | Merge branch 'fix-comment-on-diff-ajax-loading'Dmitriy Zaporozhets2016-01-221-33/+54
|\ \ \ | |/ / |/| |
| * | Fix indentation of methods chaining in CoffeeRémy Coutable2016-01-201-8/+8
| | | | | | | | | | | | [ci skip]
| * | Merge remote-tracking branch 'origin/master' into ↵Rémy Coutable2016-01-207-17/+17
| |\ \ | | | | | | | | | | | | fix-comment-on-diff-ajax-loading
| * | | Address some JS coding-style and HTML semantic issuesRémy Coutable2016-01-201-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | - Replace 'rel' attributes with 'data' or 'id' attributes - Style jQuery methods chaining according to Jacob's guidelines - Rename a method
| * | | Fix diff comments loaded by AJAX to load comment with diff in discussion tabRémy Coutable2016-01-191-25/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits also fixes two minor issues: - Ensure notes that the current user is not allowed to see are not returned in the AJAX notes loading - Ensure the notes counter badge is decremented of 1 instead of 2
* | | | Merge branch 'diff-highlight-themes' into 'master' Robert Speicher2016-01-2110-205/+176
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff highlight themes Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12484 See merge request !2530
| * | | | Make dark inline diffs a little more obviousdiff-highlight-themesDouwe Maan2016-01-211-2/+2
| | | | |
| * | | | Pretty highlighted diffs for every themeDouwe Maan2016-01-215-20/+37
| | | | |
| * | | | Use consistent markup and styling for highlighting across blobs, diffs, ↵Douwe Maan2016-01-2110-197/+151
| | | | | | | | | | | | | | | | | | | | blame and snippets
* | | | | Merge branch 'drag-drop-cursor' into 'master' Jacob Schatz2016-01-211-0/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Milestone drag & drop cursor Fixes #4097 ![grab-cursor](/uploads/f5071d7e4839c3b4b88c9f7f1270eee3/grab-cursor.gif) cc @jschatz1 @creamzy See merge request !2532
| * | | | | Milestone drag & drop cursorPhil Hughes2016-01-211-0/+11
| |/ / / / | | | | | | | | | | | | | | | Fixes #4097
* | | | | Merge branch 'fix/artifacts-download-progress-bar' into 'master' Grzegorz Bizon2016-01-212-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use progress bar when downloading build artifacts Closes #12491 See merge request !2531
| * | | | | Move build artifacts javascripts into separate filefix/artifacts-download-progress-barGrzegorz Bizon2016-01-212-0/+16
| |/ / / /
* | | | | remove execution permissions from fontsPirate Praveen2016-01-2125-0/+0
|/ / / /
* | | | Removes 100% width because it is a block element.Jacob Schatz2016-01-201-1/+0
| | | |
* | | | Implement new UI for paginationDmitriy Zaporozhets2016-01-202-37/+14
| | | |
* | | | Merge branch 'ui-is-broken-in-search-result-page' into 'master' Dmitriy Zaporozhets2016-01-211-4/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix term height so text overflap does not happen. Fixes #12449 Height was set on the `.term`. It made the text overlap. See merge request !2518
| * | | | Fix term height so text overflap does not happen.ui-is-broken-in-search-result-pageJacob Schatz2016-01-201-4/+0
| | | | |
* | | | | Merge branch ↵Dmitriy Zaporozhets2016-01-201-0/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'show-message-to-signed-out-users-to-sign-in-if-they-want-to-comment' into 'master' Adds disabled comment field and disabled avatar. Fixes #3540 ![Screen_Shot_2016-01-20_at_12.13.29_AM](/uploads/673fb783e9aeae441df9c40bfe29ac1b/Screen_Shot_2016-01-20_at_12.13.29_AM.png) See merge request !2508
| * | | | | Uses color variables instead.show-message-to-signed-out-users-to-sign-in-if-they-want-to-commentJacob Schatz2016-01-201-3/+3
| | | | | |
| * | | | | Adds disabled comment field and disabled avatar.Jacob Schatz2016-01-201-0/+36
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-204-15/+8
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master' Dmitriy Zaporozhets2016-01-201-10/+7
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes tooltip doesn't duplicate the "me" name. Checks that "me" is not in the array of names in tooltip ![emojilist](/uploads/20b1a39cda194358f9730ec3c6b86acb/emojilist.gif) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/7978 See merge request !2454
| | * | | Fixes issue where other emoji (not thumbup/thumbdown) were not removedawardemoji-tooltip-shows-people-multiple-timesJacob Schatz2016-01-191-1/+1
| | | | |
| | * | | Fix the situation where the user has named themselves "me"Jacob Schatz2016-01-181-4/+2
| | | | | | | | | | | | | | | | | | | | Stopped looking for existing user since remove functionality is fixed.
| | * | | Fix underlying issue with emoji reactionsJacob Schatz2016-01-181-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue was: blank space was rendering as a element in an array of authors. Element was being used by `join`. Original fix !2450 was trying to remove the space after it happened. This checks properly for it and only moves forward if it does not exist. Also removes "me" upon unchecking emoji.
| | * | | Removing initial `,`.Jacob Schatz2016-01-181-1/+2
| | | | |
| | * | | Fixes tooltip doesn't duplicate the "me" name.Jacob Schatz2016-01-181-8/+4
| | | | | | | | | | | | | | | | | | | | Checks that "me" is not in the array of names in tooltip
| * | | | Merge branch 'secret-shortcut-feature' into 'master' Dmitriy Zaporozhets2016-01-203-5/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Adds "t" as a shortcut for find file anywhere See merge request !2507
| | * | | Adds `t` as a shortcut for find file anywhereJacob Schatz2016-01-193-5/+1
| | | | |
* | | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-2030-35/+96
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'star-button-fork-count-increase' into 'master' Dmitriy Zaporozhets2016-01-191-2/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starring project only increases star count This is instead of increasing star & fork count Fixes #11396 ![star-count](/uploads/9a1d569393bc051d1a019f0340eec957/star-count.gif) cc. @jschatz1 See merge request !2504
| | * | | when starring a project it correctly increase the star countPhil Hughes2016-01-191-2/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | This is instead of increasing star & fork count Fixed #11396
| * | | Merge branch 'display-message-when-assignee-cannot-merge' into 'master' Dmitriy Zaporozhets2016-01-192-0/+7
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | adds exclamation point when assigned user cannot merge Fixes: #4175 See merge request !2408
| | * | Move multiple css rules to multiple lines.display-message-when-assignee-cannot-mergeJacob Schatz2016-01-192-2/+2
| | | | | | | | | | | | | | | | Removes extra line breaks.
| | * | Fix spacing issues, fix naming inconsistencies. Fix conflicts.Jacob Schatz2016-01-181-2/+2
| | | | | | | | | | | | | | | | Used `issuable` instead
| | * | color variable for error for exclamation pointJacob Schatz2016-01-182-2/+4
| | | |
| | * | adds exclamation point when assigned user cannot mergeJacob Schatz2016-01-181-0/+5
| | |/
| * | Merge branch 'browse-issues-incorrect-positioning-in-firefox-on-commit-page' ↵Dmitriy Zaporozhets2016-01-191-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix positioning issues with browse files button Issue is that in Firefox clipboard is blocking the browse files from moving all the way to the right. Move clipboard up 1px into -1px to unblock "browse files" SS from firefox: ![Screen_Shot_2016-01-18_at_4.01.58_PM](/uploads/312a5f1e55ca707081f718e2413416fb/Screen_Shot_2016-01-18_at_4.01.58_PM.png) Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/10849 See merge request !2489
| | * | Fix positioning issues with browse files buttonbrowse-issues-incorrect-positioning-in-firefox-on-commit-pageJacob Schatz2016-01-181-0/+4
| | |/ | | | | | | | | | | | | | | | Issue is that in Firefox clipboard is blocking the browse files from moving all the way to the right. Move clipboard up 1px into -1px to unblock browse files
| * | Merge branch 'search-title-clipped' into 'master' Dmitriy Zaporozhets2016-01-191-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search title gets clipped vertically. Fixed by adding height to search title css. **Before:** ![Screen_Shot_2016-01-16_at_10.12.14_AM](/uploads/2651de6ae38251e1f20acade0c69a629/Screen_Shot_2016-01-16_at_10.12.14_AM.png) **After:** ![Screen_Shot_2016-01-16_at_10.12.05_AM](/uploads/6852e9a653bde1975d7fdfa4dbc302d8/Screen_Shot_2016-01-16_at_10.12.05_AM.png) See merge request !2460
| | * | Search title was getting clipped horizontally.search-title-clippedJacob Schatz2016-01-161-0/+4
| | | | | | | | | | | | | | | | Fixed by adding height to search title css.
| * | | Reduce margin to fit dropdownsJacob Schatz2016-01-181-1/+1
| | |/ | |/| | | | | | | Fixes #10747
| * | Merge branch 'remove-leading-comma-award-emoji' into 'master' Robert Speicher2016-01-181-4/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove leading comma when user is the only one to award that emoji Fixes #9073 See merge request !2450
| | * | Remove leading comma when user is the only one to award that emojiZeger-Jan van de Weg2016-01-171-4/+9
| | | | | | | | | | | | | | | | Fixes #9073
| * | | Merge branch 'margin-update' into 'master' Jacob Schatz2016-01-181-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update old ![Screenshot_2016-01-14_22.46.52](/uploads/d165897a6118c4b276e6b53982077cb5/Screenshot_2016-01-14_22.46.52.png) new ![Screenshot_2016-01-14_22.46.21](/uploads/6b34cd8b1a2799506676103fcbc80450/Screenshot_2016-01-14_22.46.21.png) See merge request !2441
| | * | | updatemargin-updateAndriy Dyadyura2016-01-141-1/+1
| | | | |
| | * | | updateAndriy Dyadyura2016-01-141-2/+2
| | | | |