summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-282-7/+0
* Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-281-1/+1
|\
| * Merge branch 'master' into mr-merge-basemr-merge-baseDouwe Maan2016-01-285-11/+10
| |\
| * | Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-271-1/+1
* | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-281-23/+1
|\ \ \
| * \ \ Merge branch 'master' into highlight-blameDouwe Maan2016-01-285-11/+10
| |\ \ \ | | | |/ | | |/|
| * | | Move blame group logic to dedicated classDouwe Maan2016-01-281-27/+1
| * | | Fix highlighting in blame view.Douwe Maan2016-01-271-0/+4
| | |/ | |/|
* | | Merge branch 'rs-ldap-user' into 'master' Robert Speicher2016-01-281-7/+8
|\ \ \
| * | | Backport LDAP user assignment changes from EERobert Speicher2016-01-281-7/+8
| | |/ | |/|
* | | Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-281-1/+10
|\ \ \
| * | | Some CSS and sorting fixes.Rubén Dávila2016-01-201-2/+2
| * | | Add ability to sort forks. #2406Rubén Dávila2016-01-201-0/+2
| * | | Add fork button and implement ability to distinguish between public and prote...Rubén Dávila2016-01-201-1/+4
| * | | Use Project creator's avatar in fork listing. #2406Rubén Dávila2016-01-201-1/+2
| * | | Setup new fork link in sidebar and routes. #2406Rubén Dávila2016-01-201-0/+3
* | | | Merge branch 'issue_5546' into 'master' Dmitriy Zaporozhets2016-01-281-1/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | Make default sorting preference work for Issues and MRs.issue_5546Rubén Dávila2016-01-221-4/+2
| * | | Merge branch 'master' into issue_5546Rubén Dávila2016-01-227-19/+27
| |\ \ \
| * | | | Make sorting preference reusable for all projects.Rubén Dávila2016-01-221-6/+15
| * | | | Make cookie suffix more simpler.Rubén Dávila2016-01-211-2/+2
| * | | | Little refactor plus some specs.Rubén Dávila2016-01-211-12/+6
| * | | | Remember last sort option used.Rubén Dávila2016-01-201-1/+21
* | | | | Merge branch 'events-performance' into 'master' Robert Speicher2016-01-273-9/+5
|\ \ \ \ \
| * | | | | Don't pluck project IDs for eventsYorick Peterse2016-01-263-9/+5
* | | | | | Merge branch 'rs-skip-2fa-on-signout' into 'master' Robert Speicher2016-01-271-0/+2
|\ \ \ \ \ \
| * | | | | | Skip the 2FA requirement during logoutrs-skip-2fa-on-signoutRobert Speicher2016-01-231-0/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix/unexistent-group-500' into 'master' Robert Speicher2016-01-271-0/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/unexistent-...James Lopez2016-01-271-4/+5
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | update fix based on feedbackJames Lopez2016-01-271-2/+1
| * | | | | | fix for failing specJames Lopez2016-01-261-1/+2
| * | | | | | feature and fix for 500 on group missingJames Lopez2016-01-261-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rs-2fa-requirement-wording' into 'master' Dmitriy Zaporozhets2016-01-271-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update wording for 2FA requirement noticers-2fa-requirement-wordingRobert Speicher2016-01-231-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'rs-groups-index' into 'master' Douwe Maan2016-01-261-4/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make the `/groups` route behave as expectedrs-groups-indexRobert Speicher2016-01-231-4/+5
| |/ / /
* | | | Fixi import redirect loopDouglas Barbosa Alexandre2016-01-251-5/+15
|/ / /
* | | Merge branch 'fix-comment-on-diff-ajax-loading'Dmitriy Zaporozhets2016-01-221-12/+10
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into fix-comment-on-diff-ajax-lo...Rémy Coutable2016-01-203-0/+20
| |\ \ \ | | |/ /
| * | | Fix diff comments loaded by AJAX to load comment with diff in discussion tabRémy Coutable2016-01-191-12/+10
| | |/ | |/|
* | | 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