summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Change "Irc Uri" -> "IRC URI"Stan Hu2015-07-071-1/+1
* Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets2015-07-062-0/+21
|\
| * Audit log for user authenticationValery Sizov2015-07-062-0/+21
* | Merge branch 'add-irker-options' into 'master'Dmitriy Zaporozhets2015-07-061-64/+45
|\ \
| * | Add Irker service configuration optionsStan Hu2015-07-051-64/+45
| |/
* | 'created_at DESC' is performed twicecatatsuy2015-07-021-1/+1
|/
* Refactor can_be_merged logic for merge requestDmitriy Zaporozhets2015-07-012-7/+10
* Merge branch 'use-rugged-for-merge' into 'master'Dmitriy Zaporozhets2015-07-012-3/+16
|\
| * Merge branches inside one repository using rugged instead of satellitesDmitriy Zaporozhets2015-07-012-3/+16
* | fix of GitLab CI forkingValery Sizov2015-07-011-0/+1
|/
* Merge branch 'fix-zero-sha-lookup' into 'master'Dmitriy Zaporozhets2015-07-011-2/+4
|\
| * Repository#blob_at should return nil for 00000000... shafix-zero-sha-lookupDmitriy Zaporozhets2015-07-011-2/+4
* | Reporter role can manage issue tracker nowreporter-manage-issuesDmitriy Zaporozhets2015-06-301-4/+4
|/
* Refactor issue, mr, note abilities to include project abilities tooDmitriy Zaporozhets2015-06-261-13/+30
* Change dynamic abilities to new formatDmitriy Zaporozhets2015-06-261-11/+7
* Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-261-13/+13
* Simplify set of assignee, milestone and label to admin_issue ruleDmitriy Zaporozhets2015-06-261-4/+0
* Dont allow guest to set assigne, milestone and label when create new issue or...Dmitriy Zaporozhets2015-06-251-0/+3
* Merge branch 'performance-improvements' into 'master'Dmitriy Zaporozhets2015-06-251-3/+5
|\
| * Improve performance for issue#show pageDmitriy Zaporozhets2015-06-241-3/+5
* | Merge branch 'rs-issue-1850' into 'master'Douwe Maan2015-06-242-10/+6
|\ \ | |/ |/|
| * Only look up Commit authors/committers by emailrs-issue-1850Robert Speicher2015-06-232-10/+6
* | Allow user to remove public email addressrs-dev-issue-2419Robert Speicher2015-06-231-1/+3
|/
* Validate presence of provider field in Identityidentity-validationDmitriy Zaporozhets2015-06-231-0/+1
* Merge branch 'rs-dev-issue-2414' into 'master'Dmitriy Zaporozhets2015-06-231-18/+16
|\
| * Use alias_attribute to define User#two_factor_enabledrs-dev-issue-2414Robert Speicher2015-06-221-14/+3
| * Make default value for otp_required_for_login false instead of nullRobert Speicher2015-06-201-4/+4
| * Allow Admin to filter users by 2FA statusRobert Speicher2015-06-191-4/+13
* | Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-222-6/+14
|\ \
| * | Revert merge request states renamingDmitriy Zaporozhets2015-06-192-6/+14
* | | Replace remaining references to `Note.create_cross_reference_note`Robert Speicher2015-06-222-6/+1
* | | Merge branch 'web-editor-autocrlf' into 'master'Dmitriy Zaporozhets2015-06-221-1/+6
|\ \ \
| * | | Convert CRLF newlines to LF when committing using the web editor.web-editor-autocrlfDouwe Maan2015-06-201-1/+6
* | | | Merge branch 'rs-dev-issue-2355' into 'master'Dmitriy Zaporozhets2015-06-221-4/+20
|\ \ \ \
| * | | | Spec and refactor User.find_for_commitRobert Speicher2015-06-171-4/+20
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-222-5/+16
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'fix-error-500-internal-snippet' into 'master'Douwe Maan2015-06-201-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix Error 500 when one user attempts to access a personal, internal snippetStan Hu2015-06-191-1/+1
| | | |/ | | |/|
| * | | Add convenience methods to User for getting and setting 2FA statusRobert Speicher2015-06-191-0/+12
| * | | Move the User dashboard enum further up in the classRobert Speicher2015-06-191-4/+3
| |/ /
* | | Merge branch 'snippet_optional_filename' into 'master'Douwe Maan2015-06-201-1/+0
|\ \ \ | |/ / |/| |
| * | Make snippet filename optional.Nicolas2015-06-201-1/+0
* | | Merge branch 'fix-labels-permisssion-check' into 'master'Douwe Maan2015-06-181-0/+1
|\ \ \ | |_|/ |/| |
| * | Fix 403 Access Denied error messages when accessing Labels section in a proje...Stan Hu2015-06-181-0/+1
* | | Fix duplicate 'Email has already been taken' message when creating a user, up...swellard2015-06-161-1/+1
* | | Fix duplicate 'Email has already been taken' message when creating a userswellard2015-06-161-1/+3
|/ /
* | Look for .gitlab-ci.yml only if checkout_sha is presentfix-gitlab-ci-ymlDmitriy Zaporozhets2015-06-151-9/+13
* | Merge branch 'fix-ext-issue-tracker-hook' into 'master'Dmitriy Zaporozhets2015-06-151-10/+5
|\ \
| * | Fix external issue tracker hook/test for HTTPS URLsdgerhardt/gitlab-ce-fix-ext-issue-tracker-hookDaniel Gerhardt2015-06-051-10/+5
* | | Merge branch 'rs-dev-issue-2228' into 'master'Dmitriy Zaporozhets2015-06-151-1/+6
|\ \ \
View Lorry Controller Status