summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-281-2/+0
* Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-284-20/+21
|\
| * Merge branch 'master' into mr-merge-basemr-merge-baseDouwe Maan2016-01-281-7/+5
| |\
| * | Fix specsDouwe Maan2016-01-283-3/+6
| * | Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-273-19/+17
* | | Merge branch 'issue_5546' into 'master' Dmitriy Zaporozhets2016-01-281-1/+1
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into issue_5546Rubén Dávila2016-01-229-13/+50
| |\ \
| * | | Make sorting preference reusable for all projects.Rubén Dávila2016-01-224-8/+0
| * | | Remember last sort option used.Rubén Dávila2016-01-204-1/+9
* | | | Merge branch 'events-performance' into 'master' Robert Speicher2016-01-271-7/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use Atom update times of the first eventevents-performanceYorick Peterse2016-01-272-9/+1
| * | | Don't pluck project IDs for eventsYorick Peterse2016-01-262-1/+7
* | | | Update ExternalIssue regex for JIRA integrationBlake Hitchcock2016-01-261-1/+1
|/ / /
* | | Prioritize previewable over plain README filesprioritize-previewable-over-plain-readmesDouglas Barbosa Alexandre2016-01-251-4/+12
* | | Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-01-251-1/+1
|\ \ \
| * | | Use branch_count in Repository#has_visible_content?Yorick Peterse2016-01-211-1/+1
* | | | Merge branch 'ignore-binary-files-in-git-grep' into 'master' Dmitriy Zaporozhets2016-01-231-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Ignore binary files in code search to prevent Error 500Stan Hu2016-01-221-1/+1
* | | | Backport some changes from EEes_backportValery Sizov2016-01-223-0/+6
|/ / /
* | | Merge branch 'unescaped-diffs' into 'master' Robert Speicher2016-01-221-2/+6
|\ \ \
| * | | Make sure non-highlighted diffs are still escapedunescaped-diffsDouwe Maan2016-01-221-2/+6
| |/ /
* | | Merge branch 'ci/recursive-artifacts-entries' into 'master' Robert Speicher2016-01-211-4/+4
|\ \ \
| * | | Add method that calculates total size for artifacts subfolderci/recursive-artifacts-entriesKamil Trzcinski2016-01-201-4/+4
* | | | Use consistent markup and styling for highlighting across blobs, diffs, blame...Douwe Maan2016-01-211-3/+3
| |/ / |/| |
* | | Merge branch 'fix-project-creation' into 'master' Robert Speicher2016-01-201-1/+6
|\ \ \
| * | | Creator should be added as a master of the project on creationDouglas Barbosa Alexandre2016-01-201-1/+6
* | | | Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-201-0/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-201-0/+2
| |\ \ \
| | * | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-201-0/+2
| | |/ /
* | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-202-1/+7
|\ \ \ \ | |/ / /
| * | | Merge branch 'sentry-integration' into 'master' Robert Speicher2016-01-201-0/+6
| |\ \ \
| | * \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into sentry-...Jeroen Nijhof2016-01-206-21/+24
| | |\ \ \ | | | |/ /
| | * | | Add sentry integrationJeroen Nijhof2016-01-181-0/+6
| | | |/ | | |/|
| * | | Merge branch 'issue_3749' into 'master' Douwe Maan2016-01-201-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Update Issue/MR everytime a Note is saved/destroyed.Rubén Dávila2016-01-191-1/+1
| | |/
* | | Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-202-3/+21
* | | Fix MR diff_refsDouwe Maan2016-01-201-2/+2
* | | Merge branch 'master' into issue_3945Douwe Maan2016-01-2013-31/+42
|\ \ \ | |/ /
| * | Merge branch 'user-ldap-email' into 'master' Robert Speicher2016-01-191-1/+4
| |\ \
| | * \ Merge branch 'master' into user-ldap-emailDouwe Maan2016-01-195-20/+16
| | |\ \
| | * | | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-191-1/+4
| | | |/ | | |/|
| * | | Merge branch 'add-public-param-to-project-api' into 'master' Dmitriy Zaporozhets2016-01-191-0/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Add specs. Adjust filter.Josh Frye2016-01-191-1/+1
| | * | Change 'public' flag to more robust 'visibility' query.Josh Frye2016-01-191-0/+4
| | |/
| * | Greatly improve external_issue_tracker performanceimprove-project-external-issue-trackersYorick Peterse2016-01-195-20/+16
| |/
| * Merge branch 'hook_url_limit' into 'master' Dmitriy Zaporozhets2016-01-184-8/+8
| |\
| | * Raise hook url limitKirilll Zaycev2016-01-154-8/+8
| * | Use a more sensible message for the AbuseReport uniqueness validationrs-abuse-report-validationRobert Speicher2016-01-161-1/+1
| * | Merge branch 'ci/build_dependencies' into 'master' Douwe Maan2016-01-151-0/+8
| |\ \
| | * | Let the CI runner know about builds that this build depends onci/build_dependenciesKamil Trzcinski2016-01-141-0/+8
| | |/
View Lorry Controller Status