| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into mr-merge-basemr-merge-base | Douwe Maan | 2016-01-28 | 5 | -11/+10 |
| |\ | |||||
| | * | Merge branch 'events-performance' into 'master' | Robert Speicher | 2016-01-27 | 3 | -9/+5 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of retrieving last update times for events See 75195eefcca4cb3961986c90c8e837da02f30134 and https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317 for the juicy details. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415 See merge request !2613 | ||||
| | | * | Don't pluck project IDs for events | Yorick Peterse | 2016-01-26 | 3 | -9/+5 |
| | | | | | | | | | | | | | | | | By instead using a sub-query we save ourselves the overhead of loading any data into memory only to pass it on to another query. | ||||
| | * | | Merge branch 'rs-skip-2fa-on-signout' into 'master' | Robert Speicher | 2016-01-27 | 1 | -0/+2 |
| | |\ \ | | | | | | | | | | | | | | | | | Skip the 2FA requirement during logout See merge request !2581 | ||||
| | | * | | Skip the 2FA requirement during logoutrs-skip-2fa-on-signout | Robert Speicher | 2016-01-23 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | Merge branch 'fix/unexistent-group-500' into 'master' | Robert Speicher | 2016-01-27 | 1 | -0/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a 404 instead of a 500 when accessing a non-existent group Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3352 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/5600 See merge request !2614 | ||||
| | | * \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-01-27 | 1 | -4/+5 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | fix/unexistent-group-500 | ||||
| | | * | | | | update fix based on feedback | James Lopez | 2016-01-27 | 1 | -2/+1 |
| | | | | | | | |||||
| | | * | | | | fix for failing spec | James Lopez | 2016-01-26 | 1 | -1/+2 |
| | | | | | | | |||||
| | | * | | | | feature and fix for 500 on group missing | James Lopez | 2016-01-26 | 1 | -0/+1 |
| | | | |_|/ | | |/| | | |||||
| | * | | | | Merge branch 'rs-2fa-requirement-wording' into 'master' | Dmitriy Zaporozhets | 2016-01-27 | 1 | -2/+2 |
| | |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Update wording for 2FA requirement notice See merge request !2582 | ||||
| | | * | | | Update wording for 2FA requirement noticers-2fa-requirement-wording | Robert Speicher | 2016-01-23 | 1 | -2/+2 |
| | | | |/ | | |/| | |||||
| * | | | | Correctly determine MR diff base when MR has merge conflicts | Douwe Maan | 2016-01-27 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge branch 'rs-groups-index' into 'master' | Douwe Maan | 2016-01-26 | 1 | -4/+5 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the `/groups` route behave as expected The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding (or including) the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660 See merge request !2580 | ||||
| | * | | Make the `/groups` route behave as expectedrs-groups-index | Robert Speicher | 2016-01-23 | 1 | -4/+5 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660 | ||||
| * | | Fixi import redirect loop | Douglas Barbosa Alexandre | 2016-01-25 | 1 | -5/+15 |
| |/ | |||||
| * | Merge branch 'fix-comment-on-diff-ajax-loading' | Dmitriy Zaporozhets | 2016-01-22 | 1 | -12/+10 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/master' into ↵ | Rémy Coutable | 2016-01-20 | 3 | -0/+20 |
| | |\ | | | | | | | | | | fix-comment-on-diff-ajax-loading | ||||
| | * | | Fix diff comments loaded by AJAX to load comment with diff in discussion tab | Rémy Coutable | 2016-01-19 | 1 | -12/+10 |
| | | | | | | | | | | | | | | | | | | | | | | 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-mr-diff-edit-button' into 'master' | Robert Speicher | 2016-01-22 | 1 | -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-button | Douwe Maan | 2016-01-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Make sure non-highlighted diffs are still escapedunescaped-diffs | Douwe Maan | 2016-01-22 | 1 | -1/+3 |
| |/ / / | |||||
| * | | | Merge branch 'master' into issue_3945issue_3945 | Rubén Dávila | 2016-01-20 | 2 | -0/+7 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge branch 'feature/check-against-rbl-only' into 'master' | Robert Speicher | 2016-01-20 | 2 | -0/+7 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515 | ||||
| | | * | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-only | Tomasz Maczukin | 2016-01-20 | 2 | -0/+7 |
| | | |/ | |||||
| * | | | 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 |
| |\ \ | |/ | |||||
| | * | 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 'master' into issue_3945 | Rubén Dávila | 2016-01-14 | 23 | -66/+195 |
| |\ \ \ | |/ / | |||||
| | * | | 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 |
| | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |