summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-backport-ldap-2fa' into 'master' Dmitriy Zaporozhets2016-02-041-2/+7
|\
| * Support Two-factor Authentication for LDAP usersrs-backport-ldap-2faRobert Speicher2016-02-031-2/+7
* | Add sort dropdown to dashboard projects pagedashboard-sort-dropdownDmitriy Zaporozhets2016-02-031-0/+1
|/
* Support download access by PRIVATE-TOKEN headerStan Hu2016-02-031-0/+2
* Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-032-0/+19
|\
| * Refactor Admin::SpamLogsController to block user before destroyingDouglas Barbosa Alexandre2016-02-021-23/+7
| * Support Akismet spam checking for creation of issues via APIStan Hu2016-02-022-0/+35
* | Merge branch 'git-raw-workhorse' into 'master' Jacob Vosmaer2016-02-022-18/+9
|\ \
| * | Use @repositoryJacob Vosmaer2016-02-021-3/+2
| * | Avoid trailing 'charset=' garbageJacob Vosmaer2016-02-012-2/+4
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-raw...Jacob Vosmaer2016-02-0123-80/+126
| |\ \ | | |/
| * | Use only one header to send git blobsJacob Vosmaer2016-02-012-4/+2
| * | No need for base64 anymoreJacob Vosmaer2016-01-281-2/+0
| * | Send more raw blob data with workhorseJacob Vosmaer2016-01-282-8/+7
| * | Prototype of Git blobs via workhorseJacob Vosmaer2016-01-151-11/+6
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobsJacob Vosmaer2016-02-0118-75/+118
|\ \ \ | | |/ | |/|
| * | First pass at deleting projects in the background.Josh Frye2016-01-291-2/+6
| * | Merge branch 'note-background-job' into 'master' Dmitriy Zaporozhets2016-01-291-1/+1
| |\ \
| | * | [WIP] Background process note logic for #3948Josh Frye2016-01-281-1/+1
| * | | 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