summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'disable-remove-source-branch' into 'master' Douwe Maan2016-02-041-1/+2
|\
| * Hide remove source branch button when new commit is added to branchZeger-Jan van de Weg2016-02-041-1/+2
* | Merge branch 'wipMergeSpacing' into 'master' Douwe Maan2016-02-041-1/+1
|\ \ | |/ |/|
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into wipMergeSpacingTed Hogan2015-12-2964-1402/+1436
| |\
| * | No space required after WIP identifierTed Hogan2015-11-231-1/+1
* | | Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-034-1/+23
|\ \ \
| * | | Refactor Admin::SpamLogsController to block user before destroyingDouglas Barbosa Alexandre2016-02-021-0/+5
| * | | Fix typo on User modelDouglas Barbosa Alexandre2016-02-021-1/+1
| * | | Use truncate helper on spam logs listDouglas Barbosa Alexandre2016-02-021-8/+0
| * | | Support Akismet spam checking for creation of issues via APIStan Hu2016-02-024-1/+26
* | | | Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobsJacob Vosmaer2016-02-021-4/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'merge-request-closes-issues-performance' into 'master'Robert Speicher2016-02-011-4/+4
| |\ \ \
| | * | | Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performanceYorick Peterse2016-02-011-4/+4
* | | | | Use begin/end instead of defined?Jacob Vosmaer2016-02-021-5/+5
* | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobsJacob Vosmaer2016-02-0119-53/+106
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'rs-issue-12706' into 'master' Douwe Maan2016-01-302-5/+5
| |\ \ \ \
| | * | | | Increase the minimum length for commit SHA matching to 7rs-issue-12706Robert Speicher2016-01-292-5/+5
| * | | | | Merge branch 'cache-broadcast-message-current' into 'master' Dmitriy Zaporozhets2016-01-301-1/+3
| |\ \ \ \ \
| | * | | | | Change ttl to 1 minutecache-broadcast-message-currentJosh Frye2016-01-291-1/+1
| | * | | | | Cache BroadcastMessage.current for 5 minutes. Fixes #12770Josh Frye2016-01-291-1/+3
| | |/ / / /
| * | | | | Merge remote-tracking branch 'origin/background-delete-process'Dmitriy Zaporozhets2016-01-301-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | First pass at deleting projects in the background.Josh Frye2016-01-291-0/+1
| * | | | | Fix old version warning when viewing wiki latest version via version_idfix-viewing-wiki-page-lastest-version-via-version-idDouglas Barbosa Alexandre2016-01-291-1/+1
| |/ / / /
| * | | | 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
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |