summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-avatar-validation' into 'master' Douwe Maan2016-03-011-1/+1
|\
| * Only validate avatar cropping values when avatar is present AND changedrs-avatar-validationRobert Speicher2016-02-291-1/+1
* | Merge branch 'rs-fix-user-namespace_uniq' into 'master' Douwe Maan2016-03-011-1/+2
|\ \ | |/
| * Properly check for a pre-existing error in `User#namespace_uniq`rs-fix-user-namespace_uniqRobert Speicher2016-02-291-1/+2
* | Reset `otp_grace_period_started_at` after disabling 2FARobert Speicher2016-02-291-5/+6
|/
* Revert "Merge branch 'issue_5854' into 'master' "revert-6f85eb38Dmitriy Zaporozhets2016-02-291-4/+2
* Merge branch 'issue_5854' into 'master' Dmitriy Zaporozhets2016-02-291-2/+4
|\
| * Add commit message to JIRA's notification payload.Rubén Dávila2016-02-261-2/+4
* | Merge branch '11489-branded-appearance-to-ce' into 'master' Douwe Maan2016-02-291-0/+9
|\ \
| * | Branded login page also in CE11489-branded-appearance-to-ceZeger-Jan van de Weg2016-02-261-0/+9
| |/
* | Merge branch 'issue_13621' into 'master' Douwe Maan2016-02-291-1/+1
|\ \
| * | Don't repeat labels listed on Labels tab.issue_13621Rubén Dávila2016-02-221-1/+1
* | | Merge branch 'repository-caching-refactor' into 'master' Robert Speicher2016-02-262-13/+41
|\ \ \
| * | | Moved exists condition in Repository#before_deleteYorick Peterse2016-02-251-6/+4
| * | | Move Repository#expire_all_caches to before_deleteYorick Peterse2016-02-231-10/+5
| * | | Moved cache expiration code to Repository hooksYorick Peterse2016-02-232-4/+39
* | | | Add `:with_avatar` trait to User factoryRobert Speicher2016-02-241-1/+1
* | | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-2315-37/+327
|\ \ \ \ | | |_|/ | |/| |
| * | | Does not raise an error when Todo is already marked as doneDouglas Barbosa Alexandre2016-02-231-1/+1
| |/ /
| * | Ensure we don't check a commit's description for revert message if it has no ...Rémy Coutable2016-02-221-1/+1
| * | Merge branch 'tasks' into 'master' Douglas Barbosa Alexandre2016-02-223-1/+56
| |\ \
| | * | "X assigned you Y" instead of "X assigned Y"Douwe Maan2016-02-201-11/+0
| | * | Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-203-4/+4
| | * | Refactoring task queue partialsDouglas Barbosa Alexandre2016-02-201-6/+6
| | * | Improve formatted message for tasks when action is a mentionDouglas Barbosa Alexandre2016-02-201-1/+1
| | * | Use destroy, in case we ever have before_destroy callbacks on TaskDouglas Barbosa Alexandre2016-02-201-1/+1
| | * | Fix task factoryDouglas Barbosa Alexandre2016-02-201-1/+1
| | * | Create a pending task when a user is mentioned on a noteDouglas Barbosa Alexandre2016-02-202-0/+8
| | * | Create a pending task when a user is mentioned on issue/mrDouglas Barbosa Alexandre2016-02-201-0/+2
| | * | Remove task abilities, since we will only ever show the user their ownDouglas Barbosa Alexandre2016-02-201-11/+0
| | * | Allow user to mark each task as done manuallyDouglas Barbosa Alexandre2016-02-202-0/+15
| | * | Add tasks queue list pageDouglas Barbosa Alexandre2016-02-201-0/+23
| | * | Add task modelDouglas Barbosa Alexandre2016-02-202-1/+30
| * | | Merge branch 'merge-when-succeeded' into 'master' Douwe Maan2016-02-222-10/+15
| |\ \ \
| | * | | Fix Merge When Succeeded for multiple stagesKamil Trzcinski2016-02-192-10/+15
| | | |/ | | |/|
| * | | Flush emptiness caches whenever neededYorick Peterse2016-02-201-0/+4
| | |/ | |/|
| * | Merge branch 'visibletrap/gitlab-ce-label'Douwe Maan2016-02-191-7/+8
| |\ \
| | * | Label description and Label rowTap2016-02-171-7/+8
| * | | Merge branch 'rs-blob' into 'master' Douwe Maan2016-02-201-0/+34
| |\ \ \
| | * | | Add a `Blob` model that wraps `Gitlab::Git::Blob`rs-blobRobert Speicher2016-02-181-0/+34
| * | | | Merge branch '12792-emoji-as-text-diff-comment'Douwe Maan2016-02-191-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Improve #set_award! on the Note model12792-emoji-as-text-diff-commentZeger-Jan van de Weg2016-02-191-4/+1
| | * | | Emoji reponses on diffs aren't award emojiZeger-Jan van de Weg2016-02-191-0/+4
| * | | | Merge branch 'issue_3276' into 'master' Jacob Schatz2016-02-192-0/+18
| |\ \ \ \
| | * | | | Some refactor for CSS after code review.Rubén Dávila2016-02-031-0/+3
| | * | | | Add specs.Rubén Dávila2016-02-021-0/+1
| | * | | | Add elpased time.Rubén Dávila2016-02-021-0/+9
| | * | | | Add labels tab to milestone detail view.Rubén Dávila2016-02-022-0/+5
| * | | | | Merge branch 'commit-status-fix' into 'master' Kamil Trzciński2016-02-192-4/+4
| |\ \ \ \ \
| | * | | | | Fix missing ignored? for GenericCommitStatuscommit-status-fixKamil Trzcinski2016-02-192-4/+4
View Lorry Controller Status