summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'fix-mr-diff-edit-button' into 'master' Robert Speicher2016-01-221-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-1/+1
| | | | | |
| * | | | | Make sure non-highlighted diffs are still escapedunescaped-diffsDouwe Maan2016-01-221-1/+3
| |/ / / /
| * | | | Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-202-0/+7
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-202-0/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515
| | | * | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-202-0/+7
| | | |/ /
| * | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-202-0/+13
| |\ \ \ \ | | |/ / /
| | * | | Send user context to SentryDouwe Maan2016-01-201-0/+11
| | | | |
| | * | | Add sentry integrationJeroen Nijhof2016-01-181-0/+2
| | |/ /
| * | | Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-202-4/+8
| | | |
| * | | Merge branch 'master' into issue_3945Douwe Maan2016-01-208-7/+9
| |\ \ \ | | |/ /
| * | | Merge branch 'master' into issue_3945Rubén Dávila2016-01-1423-66/+195
| |\ \ \
| * | | | More refactoring from last code review. #3945Rubén Dávila2016-01-143-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
| * | | | Use the adequate reference for the old rev. #3945Rubén Dávila2016-01-141-1/+1
| | | | |
| * | | | Add inline diff markers in highlighted diffs.Douwe Maan2016-01-141-1/+1
| | | | |
| * | | | Use current commit id if it doesn't have a parent. #3945Rubén Dávila2016-01-131-1/+1
| | | | |
| * | | | Fix broken specs. #3945Rubén Dávila2016-01-121-1/+2
| | | | |
| * | | | Small fixes from code review. #3945Rubén Dávila2016-01-121-1/+1
| | | | |
| * | | | Reuse existent vars with ref and path. #3945Rubén Dávila2016-01-121-3/+1
| | | | |
| * | | | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-075-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content.
| * | | | Apply syntax highlighting when expanding diff plus some refactor. #3945Rubén Dávila2015-12-311-1/+1
| | | | |
* | | | | WIP lazy blobsJacob Vosmaer2016-02-011-0/+3
| |_|/ / |/| | |
* | | | Autofill abuse message text with user url. Closes #2838Josh Frye2016-01-161-0/+1
| | | |
* | | | Merge branch 'fix-autocomplete-new-issues' into 'master' Robert Speicher2016-01-153-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix autocomplete for new issues/MRs/snippets Fixes gitlab-org/gitlab-ce#8067 See merge request !2446
| * | | | Fix autocomplete for new issues/MRs/snippetsfix-autocomplete-new-issuesYorick Peterse2016-01-153-2/+3
| | |/ / | |/| |
* | | | Merge branch 'feature/allow-artifacts-for-reporters' into 'master' Douwe Maan2016-01-153-4/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Allow access to artifacts for users with reporter role This is originally introduced by @ajohnsn in this merge request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2259 I've added and refactored specs, original commit by @ajohnsn has been cherry picked here. See merge request !2448
| * | | Fix nonexistent method in artifacts controllerGrzegorz Bizon2016-01-151-1/+1
| | | |
| * | | Give reporters the ability to download artifacts.Andrew Johnson2016-01-152-3/+3
| |/ / | | | | | | | | | Also fix a few places where page_404 should be render_404.
* | | Merge branch 'issue_7975' into 'master' Drew Blessing2016-01-151-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Consider that URL can end with '/' before redirecting. Closes #7975 See merge request !2416
| * | Consider that URL can end with '/' before redirecting. #7975issue_7975Rubén Dávila2016-01-131-1/+1
| | |
* | | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-141-0/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unsubscribe from thread through link in email footer Closes #3437 ![Screenshot_from_2015-12-11_15-35-06](/uploads/cfb3d8737d4757f527995411f103d0ce/Screenshot_from_2015-12-11_15-35-06.png) ![Screenshot_from_2015-12-11_15-35-56](/uploads/9b7121be7ce4b05e5995ca6d38c5bea4/Screenshot_from_2015-12-11_15-35-56.png) See merge request !2068
| * | | #can_unsubscribe? -> #?unsubscribable?Zeger-Jan van de Weg2016-01-111-1/+1
| | | |
| * | | Minor improvements, unsubscribe from email footerZeger-Jan van de Weg2016-01-091-2/+2
| | | |
| * | | Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-091-0/+25
| | | |
* | | | Improve readability of artifacts browser `Entry` related codeGrzegorz Bizon2016-01-141-5/+5
| | | |
* | | | Improvements, readability for artifacts browserGrzegorz Bizon2016-01-141-7/+7
| | | |
* | | | Check if file exists in metadata in download actionGrzegorz Bizon2016-01-141-3/+8
| | | |
* | | | Render only valid paths in artifacts metadataGrzegorz Bizon2016-01-141-1/+4
| | | | | | | | | | | | | | | | | | | | In this version we will support only relative paths in artifacts metadata. Support for absolute paths will be introduced later.
* | | | Simplify implementation of build artifacts browser (refactoring)Grzegorz Bizon2016-01-141-1/+7
| | | |
* | | | Add method that checks if path exists in `StringPath`Grzegorz Bizon2016-01-141-1/+1
| | | |
* | | | Render 404 when artifacts path is invalidGrzegorz Bizon2016-01-141-0/+1
| | | |
* | | | Extract artifacts metadata implementation to separate classGrzegorz Bizon2016-01-141-4/+1
| | | |
* | | | Parse artifacts metadata stored in JSON formatGrzegorz Bizon2016-01-141-2/+2
| | | |
* | | | Use metadata stored in artifacats metadata fileGrzegorz Bizon2016-01-141-2/+2
| | | |
* | | | Add artifacts metadata uploader filedGrzegorz Bizon2016-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | Artifacts metadata field will be used to store a filename of gzipped file containing metadata definition for given artifacts archive.
* | | | Update specs for CI Build, add `artifacts?` methodGrzegorz Bizon2016-01-141-0/+2
| | | | | | | | | | | | | | | | `artifacts?` method checks if artifacts archive is available.
* | | | Remove artifacts metadata column from databaseGrzegorz Bizon2016-01-141-4/+1
| | | |
* | | | Add artifacts browserGrzegorz Bizon2016-01-141-4/+2
| | | | | | | | | | | | | | | | | | | | This implementation makes it possible to browse artifacts, it depends on artifacts metadata.
* | | | Use `Gitlab::StringPath` in CI build artifacts controllerGrzegorz Bizon2016-01-141-1/+8
| | | |
* | | | Move artifacts controller level upGrzegorz Bizon2016-01-141-2/+2
| | | | | | | | | | | | | | | | This reverts nesting artifacts controller in builds module.