Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blocking | Robert Speicher | 2016-01-28 | 2 | -7/+0 |
* | Merge branch 'mr-merge-base' into 'master' | Robert Speicher | 2016-01-28 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'master' into mr-merge-basemr-merge-base | Douwe Maan | 2016-01-28 | 5 | -11/+10 |
| |\ | |||||
| * | | Correctly determine MR diff base when MR has merge conflicts | Douwe Maan | 2016-01-27 | 1 | -1/+1 |
* | | | Merge branch 'highlight-blame' into 'master' | Robert Speicher | 2016-01-28 | 1 | -23/+1 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into highlight-blame | Douwe Maan | 2016-01-28 | 5 | -11/+10 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Move blame group logic to dedicated class | Douwe Maan | 2016-01-28 | 1 | -27/+1 |
| * | | | Fix highlighting in blame view. | Douwe Maan | 2016-01-27 | 1 | -0/+4 |
| | |/ | |/| | |||||
* | | | Merge branch 'rs-ldap-user' into 'master' | Robert Speicher | 2016-01-28 | 1 | -7/+8 |
|\ \ \ | |||||
| * | | | Backport LDAP user assignment changes from EE | Robert Speicher | 2016-01-28 | 1 | -7/+8 |
| | |/ | |/| | |||||
* | | | Merge branch 'issue_2406' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 1 | -1/+10 |
|\ \ \ | |||||
| * | | | Some CSS and sorting fixes. | Rubén Dávila | 2016-01-20 | 1 | -2/+2 |
| * | | | Add ability to sort forks. #2406 | Rubén Dávila | 2016-01-20 | 1 | -0/+2 |
| * | | | Add fork button and implement ability to distinguish between public and prote... | Rubén Dávila | 2016-01-20 | 1 | -1/+4 |
| * | | | Use Project creator's avatar in fork listing. #2406 | Rubén Dávila | 2016-01-20 | 1 | -1/+2 |
| * | | | Setup new fork link in sidebar and routes. #2406 | Rubén Dávila | 2016-01-20 | 1 | -0/+3 |
* | | | | Merge branch 'issue_5546' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 1 | -1/+22 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Make default sorting preference work for Issues and MRs.issue_5546 | Rubén Dávila | 2016-01-22 | 1 | -4/+2 |
| * | | | Merge branch 'master' into issue_5546 | Rubén Dávila | 2016-01-22 | 7 | -19/+27 |
| |\ \ \ | |||||
| * | | | | Make sorting preference reusable for all projects. | Rubén Dávila | 2016-01-22 | 1 | -6/+15 |
| * | | | | Make cookie suffix more simpler. | Rubén Dávila | 2016-01-21 | 1 | -2/+2 |
| * | | | | Little refactor plus some specs. | Rubén Dávila | 2016-01-21 | 1 | -12/+6 |
| * | | | | Remember last sort option used. | Rubén Dávila | 2016-01-20 | 1 | -1/+21 |
* | | | | | Merge branch 'events-performance' into 'master' | Robert Speicher | 2016-01-27 | 3 | -9/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Don't pluck project IDs for events | Yorick Peterse | 2016-01-26 | 3 | -9/+5 |
* | | | | | | Merge branch 'rs-skip-2fa-on-signout' into 'master' | Robert Speicher | 2016-01-27 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/unexistent-... | James Lopez | 2016-01-27 | 1 | -4/+5 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | 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 noticers-2fa-requirement-wording | Robert Speicher | 2016-01-23 | 1 | -2/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'rs-groups-index' into 'master' | Douwe Maan | 2016-01-26 | 1 | -4/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Make the `/groups` route behave as expectedrs-groups-index | Robert Speicher | 2016-01-23 | 1 | -4/+5 |
| |/ / / | |||||
* | | | | 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 fix-comment-on-diff-ajax-lo... | Rémy Coutable | 2016-01-20 | 3 | -0/+20 |
| |\ \ \ | | |/ / | |||||
| * | | | Fix diff comments loaded by AJAX to load comment with diff in discussion tab | Rémy Coutable | 2016-01-19 | 1 | -12/+10 |
| | |/ | |/| | |||||
* | | | Merge branch 'fix-mr-diff-edit-button' into 'master' | Robert Speicher | 2016-01-22 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | 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 |
| |\ \ | |||||
| | * | | 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 |