summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ | |/
| * 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 '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
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP Sync blocked user edgecases Allow GitLab admins to block otherwise valid GitLab LDAP users (https://gitlab.com/gitlab-org/gitlab-ce/issues/3462) Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other. Expected behavior: - [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?` - [x] "ldap_blocked" users can't be unblocked by the Admin UI - [x] "ldap_blocked" users can't be unblocked by the API - [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked" - [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization - [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked` Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users: ![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png) There will be another MR for the EE version. See merge request !2242
| | * | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show referenced MRs & Issues only when the current viewer can access them This addresses both issues identified in #6066. ## The private MR by user `remy2` with a note referencing to a public issue ![Screen_Shot_2016-01-12_at_16.45.02](/uploads/c245ec2c1fdea1f9ba05183c24e142d9/Screen_Shot_2016-01-12_at_16.45.02.png) --- ## The public issue viewed by user `remy` **who doesn't have access to `remy2/private-project`** before the fix ![Screen_Shot_2016-01-12_at_18.14.50](/uploads/8db5580e803f5bddd6cb935233c579a0/Screen_Shot_2016-01-12_at_18.14.50.png) --- ## The public issue viewed by user `remy` **who doesn't have access to `remy2/private-project`** with the fix ![Screen_Shot_2016-01-13_at_12.02.32](/uploads/cb199f7b78191fba486a11412412e307/Screen_Shot_2016-01-13_at_12.02.32.png) --- ## The public issue viewed by user `remy2` with the fix (no change) ![Screen_Shot_2016-01-13_at_11.54.06](/uploads/ddece590d69f597a95559beddcd36660/Screen_Shot_2016-01-13_at_11.54.06.png) See merge request !2405
| | * \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Rémy Coutable2016-01-132-4/+3
| | |\ \ \ | | | | |/ | | | |/| | | | | | fix/private-references
| | * | | 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
| | | | | | | | | | | | | | | | | | | | Closes #3046
| * | | | Remove alert_type attribute from BroadcastMessageRobert Speicher2016-01-131-4/+7
| | |/ / | |/| |
| * | | Merge branch 'configure-randomize-metrics-sample-interval' into 'master' Yorick Peterse2016-01-131-0/+1
| |\ \ \ | | | | | | | | | | See merge request !2406
View Lorry Controller Status