summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'issue_2239' into 'master' Dmitriy Zaporozhets2016-01-221-0/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a link for fetching merge requests from command line instructions Closes #2239 See merge request !2540
| | * | | | | | Add link for checkout MRs info.issue_2239Rubén Dávila2016-01-211-0/+4
| | | |_|_|/ / | | |/| | | |
| * | | | | | 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 'es_backport' into 'master' Dmitriy Zaporozhets2016-01-224-0/+81
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport some changes from EE See merge request !2548
| | * | | | | Backport some changes from EEes_backportValery Sizov2016-01-224-0/+81
| | |/ / / /
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | Merge remote-tracking branch 'origin/master' into ↵Rémy Coutable2016-01-2025-34/+126
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | fix-comment-on-diff-ajax-loading
| | * | | | | Address some JS coding-style and HTML semantic issuesRémy Coutable2016-01-205-32/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-192-37/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'fix-error-500-mr-search' into 'master' Dmitriy Zaporozhets2016-01-221-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when doing a search for merge requests Potential fix for #11547 See merge request !2525
| | * | | | | Fix Error 500 when doing a search for merge requestsStan Hu2016-01-201-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | Potential fix for #11547
| * | | | | Merge branch 'fix-mr-diff-edit-button' into 'master' Robert Speicher2016-01-224-29/+27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR diff 'Edit' button It now works and has the right size. See merge request !2542
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More highlighted diff fixes See merge request !2545
| | * | | | | | 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 escaped Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521 See merge request !2544
| | * | | | | | 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 to calculate total size of artifacts in subpath See merge request !2500
| | * | | | | | 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
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2121-260/+212
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | 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-213-10/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-213-13/+16
| | | | | | | |
| | * | | | | | Do not use progress bar when downloading build artifactsGrzegorz Bizon2016-01-211-1/+5
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Closes #12491
| * | | | | | 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. 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 'fix-project-creation' into 'master' Robert Speicher2016-01-202-2/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creator should be added as a master of the project on creation Fixes #4222 This also enable a project creator to add themselves as a master of the project for existing repositories that were created in the meanwhile that they don't appear as members. See merge request !2520
| | * | | | | | Creator should be added as a master of the project on creationDouglas Barbosa Alexandre2016-01-202-2/+7
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | This also enable a project creator to add themselves as a master of the project.
| * | | | | | Merge branch ↵Dmitriy Zaporozhets2016-01-202-0/+46
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-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
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515
| | | * | | | | 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
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sentry integration Sentry is an event logging platform primarily focused on capturing and aggregating exceptions. With this MR it will be possible to log and track exceptions from GitLab to Sentry. https://gitlab.com/gitlab-com/operations/issues/39 See merge request !2485
| | | * | | | | 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 ↵Jeroen Nijhof2016-01-2024-65/+131
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sentry-integration Conflicts: db/schema.rb
| | | * | | | | Add sentry integrationJeroen Nijhof2016-01-183-0/+25
| | | | | | | |