summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-mr-diff-edit-button' into 'master' Robert Speicher2016-01-221-1/+1
|\
| * 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
| |\
| | * 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
|\ \ | |/
| * 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/snippetsfix-autocomplete-new-issuesYorick Peterse2016-01-153-2/+3
| * | Merge branch 'feature/allow-artifacts-for-reporters' into 'master' Douwe Maan2016-01-153-4/+4
| |\ \
| | * | Fix nonexistent method in artifacts controllerGrzegorz Bizon2016-01-151-1/+1
| | * | Give reporters the ability to download artifacts.Andrew Johnson2016-01-152-3/+3
| | |/
| * | Merge branch 'issue_7975' into 'master' Drew Blessing2016-01-151-1/+1
| |\ \ | | |/ | |/|
| | * Consider that URL can end with '/' before redirecting. #7975issue_7975Rubén Dávila2016-01-131-1/+1
* | | Merge branch 'master' into issue_3945Rubén Dávila2016-01-1423-66/+195
|\ \ \ | |/ /
| * | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-141-0/+25
| |\ \
| | * | #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
| * | | 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
| * | | Update specs for CI Build, add `artifacts?` methodGrzegorz Bizon2016-01-141-0/+2
| * | | Remove artifacts metadata column from databaseGrzegorz Bizon2016-01-141-4/+1
| * | | Add artifacts browserGrzegorz Bizon2016-01-141-4/+2
| * | | Use `Gitlab::StringPath` in CI build artifacts controllerGrzegorz Bizon2016-01-141-1/+8
| * | | Move artifacts controller level upGrzegorz Bizon2016-01-141-2/+2
| * | | Add view action to artifacts controllerGrzegorz Bizon2016-01-141-0/+4
| * | | Move build artifacts implementation to separate controllerGrzegorz Bizon2016-01-142-27/+36
| * | | Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-142-1/+5
| |\ \ \
| | * | | Code style fixes and some code simplifiedGabriel Mazetto2016-01-081-2/+2
| | * | | Repair ldap_blocked state when no ldap identity exist anymoreGabriel Mazetto2016-01-081-0/+2
| | * | | Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-081-1/+3
| | |/ /
| * | | Merge branch 'fix/private-references' into 'master' Douwe Maan2016-01-141-1/+1
| |\ \ \
| | * \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/pri...Rémy Coutable2016-01-132-4/+3
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Show referenced MRs & Issues only when the current viewer can access themRémy Coutable2016-01-131-1/+1
| * | | | Broadcast Messages can now be editedRobert Speicher2016-01-131-5/+17
View Lorry Controller Status