| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Merge branch 'master' into issue_3945 | Douwe Maan | 2016-01-20 | 2 | -0/+13 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | Send user context to Sentry | Douwe Maan | 2016-01-20 | 1 | -0/+11 | |
| | | | | | ||||||
| | | * | | Add sentry integration | Jeroen Nijhof | 2016-01-18 | 1 | -0/+2 | |
| | | |/ | ||||||
| | * | | Save and use actual diff base commit for MR diff highlighting | Douwe Maan | 2016-01-20 | 2 | -4/+8 | |
| | | | | ||||||
| | * | | Merge branch 'master' into issue_3945 | Douwe Maan | 2016-01-20 | 8 | -7/+9 | |
| | |\ \ | | |/ | ||||||
| | * | | Merge branch 'master' into issue_3945 | Rubén Dávila | 2016-01-14 | 23 | -66/+195 | |
| | |\ \ | ||||||
| | * | | | More refactoring from last code review. #3945 | Rubén Dávila | 2016-01-14 | 3 | -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. #3945 | Rubén Dávila | 2016-01-14 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Add inline diff markers in highlighted diffs. | Douwe Maan | 2016-01-14 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Use current commit id if it doesn't have a parent. #3945 | Rubén Dávila | 2016-01-13 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Fix broken specs. #3945 | Rubén Dávila | 2016-01-12 | 1 | -1/+2 | |
| | | | | | ||||||
| | * | | | Small fixes from code review. #3945 | Rubén Dávila | 2016-01-12 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Reuse existent vars with ref and path. #3945 | Rubén Dávila | 2016-01-12 | 1 | -3/+1 | |
| | | | | | ||||||
| | * | | | Change strategy to highlight diffs. #3945 | Rubén Dávila | 2016-01-07 | 5 | -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. #3945 | Rubén Dávila | 2015-12-31 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | WIP lazy blobs | Jacob Vosmaer | 2016-02-01 | 1 | -0/+3 | |
| | |_|/ |/| | | ||||||
| * | | | Autofill abuse message text with user url. Closes #2838 | Josh Frye | 2016-01-16 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Merge branch 'fix-autocomplete-new-issues' into 'master' | Robert Speicher | 2016-01-15 | 3 | -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-issues | Yorick Peterse | 2016-01-15 | 3 | -2/+3 | |
| | | |/ | |/| | ||||||
| * | | | Merge branch 'feature/allow-artifacts-for-reporters' into 'master' | Douwe Maan | 2016-01-15 | 3 | -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 controller | Grzegorz Bizon | 2016-01-15 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Give reporters the ability to download artifacts. | Andrew Johnson | 2016-01-15 | 2 | -3/+3 | |
| | |/ / | | | | | | | | | | Also fix a few places where page_404 should be render_404. | |||||
| * | | | Merge branch 'issue_7975' into 'master' | Drew Blessing | 2016-01-15 | 1 | -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_7975 | Rubén Dávila | 2016-01-13 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' | Douwe Maan | 2016-01-14 | 1 | -0/+25 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unsubscribe from thread through link in email footer Closes #3437   See merge request !2068 | |||||
| | * | | | #can_unsubscribe? -> #?unsubscribable? | Zeger-Jan van de Weg | 2016-01-11 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Minor improvements, unsubscribe from email footer | Zeger-Jan van de Weg | 2016-01-09 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | Unsubscribe from thread through link in email footer | Zeger-Jan van de Weg | 2016-01-09 | 1 | -0/+25 | |
| | | | | | ||||||
| * | | | | Improve readability of artifacts browser `Entry` related code | Grzegorz Bizon | 2016-01-14 | 1 | -5/+5 | |
| | | | | | ||||||
| * | | | | Improvements, readability for artifacts browser | Grzegorz Bizon | 2016-01-14 | 1 | -7/+7 | |
| | | | | | ||||||
| * | | | | Check if file exists in metadata in download action | Grzegorz Bizon | 2016-01-14 | 1 | -3/+8 | |
| | | | | | ||||||
| * | | | | Render only valid paths in artifacts metadata | Grzegorz Bizon | 2016-01-14 | 1 | -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 Bizon | 2016-01-14 | 1 | -1/+7 | |
| | | | | | ||||||
| * | | | | Add method that checks if path exists in `StringPath` | Grzegorz Bizon | 2016-01-14 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Render 404 when artifacts path is invalid | Grzegorz Bizon | 2016-01-14 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | Extract artifacts metadata implementation to separate class | Grzegorz Bizon | 2016-01-14 | 1 | -4/+1 | |
| | | | | | ||||||
| * | | | | Parse artifacts metadata stored in JSON format | Grzegorz Bizon | 2016-01-14 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Use metadata stored in artifacats metadata file | Grzegorz Bizon | 2016-01-14 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Add artifacts metadata uploader filed | Grzegorz Bizon | 2016-01-14 | 1 | -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?` method | Grzegorz Bizon | 2016-01-14 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | `artifacts?` method checks if artifacts archive is available. | |||||
| * | | | | Remove artifacts metadata column from database | Grzegorz Bizon | 2016-01-14 | 1 | -4/+1 | |
| | | | | | ||||||
| * | | | | Add artifacts browser | Grzegorz Bizon | 2016-01-14 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | | This implementation makes it possible to browse artifacts, it depends on artifacts metadata. | |||||
| * | | | | Use `Gitlab::StringPath` in CI build artifacts controller | Grzegorz Bizon | 2016-01-14 | 1 | -1/+8 | |
| | | | | | ||||||
| * | | | | Move artifacts controller level up | Grzegorz Bizon | 2016-01-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | This reverts nesting artifacts controller in builds module. | |||||
| * | | | | Add view action to artifacts controller | Grzegorz Bizon | 2016-01-14 | 1 | -0/+4 | |
| | | | | | ||||||
| * | | | | Move build artifacts implementation to separate controller | Grzegorz Bizon | 2016-01-14 | 2 | -27/+36 | |
| | | | | | ||||||
| * | | | | Merge branch 'feature/ldap-sync-edgecases' into 'master' | Douwe Maan | 2016-01-14 | 2 | -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:  There will be another MR for the EE version. See merge request !2242 | |||||
| | * | | | | Code style fixes and some code simplified | Gabriel Mazetto | 2016-01-08 | 1 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | Repair ldap_blocked state when no ldap identity exist anymore | Gabriel Mazetto | 2016-01-08 | 1 | -0/+2 | |
| | | | | | | ||||||
| | * | | | | Prevent ldap_blocked users from being unblocked by the Admin UI | Gabriel Mazetto | 2016-01-08 | 1 | -1/+3 | |
| | |/ / / | ||||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |