summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Add `dashboard` attribute to User modelRobert Speicher2015-06-131-1/+6
* | | | Merge pull request #9340 from jvanbaarsen/update-noteableDmitriy Zaporozhets2015-06-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Update noteable after a new note is addedJeroen van Baarsen2015-06-051-1/+1
* | | | Ensure `session_expire_delay` field exists before accessing itrs-issue-1798Robert Speicher2015-06-131-4/+4
* | | | Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-121-0/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | session_expire_seconds => session_expire_delaythemaze752015-06-101-2/+6
| * | | Add session expiration delay configuration through UI applicationEric Maziade2015-06-051-0/+2
* | | | Merge branch 'refactor-mr-widget' into 'master'Dmitriy Zaporozhets2015-06-121-0/+12
|\ \ \ \
| * | | | Improve variables in mr widgetDmitriy Zaporozhets2015-06-111-0/+4
| * | | | Refactor accept merge request widgetDmitriy Zaporozhets2015-06-111-0/+8
* | | | | Merge pull request #9371 from zenati/patch-2Dmitriy Zaporozhets2015-06-112-4/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | An `in_namespace` scope is already presentzenati2015-06-092-4/+6
* | | | | Fix taskable requirers-pre-rspec-3Robert Speicher2015-06-101-0/+1
* | | | | Add `respond_to_missing?` for Commit and RepositoryRobert Speicher2015-06-102-8/+4
|/ / / /
* | | | Correctly remove already-mentioned commits for cross referencesrs-issue-1778Robert Speicher2015-06-081-1/+7
| |_|/ |/| |
* | | Merge branch 'make-namespaces-api-available-to-all-users' into 'master'Dmitriy Zaporozhets2015-06-041-0/+6
|\ \ \ | |/ / |/| |
| * | Make namespace API available to all usersStan Hu2015-05-281-0/+6
| |/
* | Skip repo removing whem remove user or groupDmitriy Zaporozhets2015-06-031-4/+8
* | Log group creation and removalDmitriy Zaporozhets2015-06-031-0/+4
* | Remove projects before group/user. Remove namespace directory asyncfix-group-removeDmitriy Zaporozhets2015-06-031-2/+9
View Lorry Controller Status