summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-comment-on-diff-ajax-loading'Dmitriy Zaporozhets2016-01-226-52/+69
|\
| * Fix indentation of methods chaining in CoffeeRémy Coutable2016-01-201-8/+8
| * Merge remote-tracking branch 'origin/master' into fix-comment-on-diff-ajax-lo...Rémy Coutable2016-01-2025-34/+126
| |\
| * | Address some JS coding-style and HTML semantic issuesRémy Coutable2016-01-205-32/+33
| * | Fix diff comments loaded by AJAX to load comment with diff in discussion tabRémy Coutable2016-01-192-37/+53
* | | Merge branch 'fix-error-500-mr-search' into 'master' Dmitriy Zaporozhets2016-01-221-1/+1
|\ \ \
| * | | Fix Error 500 when doing a search for merge requestsStan Hu2016-01-201-1/+1
| | |/ | |/|
* | | Merge branch 'fix-mr-diff-edit-button' into 'master' Robert Speicher2016-01-224-29/+27
|\ \ \
| * | | Fix MR diff 'Edit' buttonfix-mr-diff-edit-buttonDouwe Maan2016-01-214-29/+27
* | | | Merge branch 'fix-diff-comments' into 'master' Robert Speicher2016-01-221-1/+2
|\ \ \ \
| * | | | Restore diff commentsDouwe Maan2016-01-221-1/+2
| |/ / /
* | | | Merge branch 'unescaped-diffs' into 'master' Robert Speicher2016-01-222-3/+9
|\ \ \ \
| * | | | Make sure non-highlighted diffs are still escapedunescaped-diffsDouwe Maan2016-01-222-3/+9
| |/ / /
* | | | Merge branch 'ci/recursive-artifacts-entries' into 'master' Robert Speicher2016-01-212-5/+5
|\ \ \ \
| * | | | Add method that calculates total size for artifacts subfolderci/recursive-artifacts-entriesKamil Trzcinski2016-01-202-5/+5
* | | | | Merge branch 'diff-highlight-themes' into 'master' Robert Speicher2016-01-2121-268/+237
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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, blame...Douwe Maan2016-01-2121-260/+212
* | | | | Merge branch 'drag-drop-cursor' into 'master' Jacob Schatz2016-01-211-0/+11
|\ \ \ \ \
| * | | | | Milestone drag & drop cursorPhil Hughes2016-01-211-0/+11
| |/ / / /
* | | | | Merge branch 'fix/artifacts-download-progress-bar' into 'master' Grzegorz Bizon2016-01-213-10/+17
|\ \ \ \ \
| * | | | | Move build artifacts javascripts into separate filefix/artifacts-download-progress-barGrzegorz Bizon2016-01-213-13/+16
| * | | | | Do not use progress bar when downloading build artifactsGrzegorz Bizon2016-01-211-1/+5
| |/ / / /
* | | | | 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-207-53/+28
* | | | 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.ui-is-broken-in-search-result-pageJacob Schatz2016-01-201-4/+0
* | | | | Merge branch 'fix-project-creation' into 'master' Robert Speicher2016-01-202-2/+7
|\ \ \ \ \
| * | | | | Creator should be added as a master of the project on creationDouglas Barbosa Alexandre2016-01-202-2/+7
* | | | | | Merge branch 'show-message-to-signed-out-users-to-sign-in-if-they-want-to-com...Dmitriy Zaporozhets2016-01-202-0/+46
|\ \ \ \ \ \
| * | | | | | 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-202-0/+46
| |/ / / / /
* | | | | | Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-204-0/+25
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-204-0/+25
| |\ \ \ \ \
| | * | | | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-204-0/+25
| | |/ / / /
* | | | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-2014-22/+52
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'sentry-integration' into 'master' Robert Speicher2016-01-204-1/+39
| |\ \ \ \ \
| | * | | | | Target '_blank'sentry-integrationDouwe Maan2016-01-201-2/+2
| | * | | | | Send user context to SentryDouwe Maan2016-01-201-0/+11
| | * | | | | Use sentry in env production onlyJeroen Nijhof2016-01-201-1/+3
| | * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into sentry-...Jeroen Nijhof2016-01-2024-65/+131
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | Add sentry integrationJeroen Nijhof2016-01-183-0/+25
| * | | | | | Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master' Dmitriy Zaporozhets2016-01-201-10/+7
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | 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
| | * | | | | Fix underlying issue with emoji reactionsJacob Schatz2016-01-181-6/+8
| | * | | | | Removing initial `,`.Jacob Schatz2016-01-181-1/+2
| | * | | | | Fixes tooltip doesn't duplicate the "me" name.Jacob Schatz2016-01-181-8/+4