summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | No need for compare_failedJacob Vosmaer2016-02-261-2/+1
| | | | | |
* | | | | | Fixes caught by failing testsJacob Vosmaer2016-02-262-2/+2
| | | | | |
* | | | | | Refactor diff finding in NoteJacob Vosmaer2016-02-261-14/+10
| | | | | |
* | | | | | Move diff options aroundJacob Vosmaer2016-02-262-7/+18
| | | | | |
* | | | | | RubocopJacob Vosmaer2016-02-261-5/+8
| | | | | |
* | | | | | Make more use of DiffHelperJacob Vosmaer2016-02-261-7/+18
| | | | | |
* | | | | | Fix note diff searchJacob Vosmaer2016-02-251-1/+1
| | | | | |
* | | | | | Use less to_aJacob Vosmaer2016-02-252-10/+5
| | | | | |
* | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffsJacob Vosmaer2016-02-2522-101/+468
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | description
| * | | | Merge branch 'tasks' into 'master' Douglas Barbosa Alexandre2016-02-223-1/+56
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Todos Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2425 Tasks: - Prepare database - [X] Create a new table (`todos`) - Tasks Queue view - [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page - [X] Add a chronological list of todos, with the 'Todos' tab active by default - [X] Add a 'Done' button to each todo - [x] Add filters (project, author, type, and action) - Todos generation - [X] When user issue/mr is assgined to someone - [x] When user is mentioned on (issues/mr's/comments) - Mark todo as `done` - [X] When clicks on the 'Done' button - [X] When edit issue/mr - [X] When left/edit a comment - [X] When reassign issue/mr - [X] When add/remove labels to issue/mr - [X] When issue/mr is closed - [X] When mr is merged - [X] When added an emoji - [X] When changed the issue/mr milestone * Screenshot: ![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png) See merge request !2817
| | * | | | "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 bugs in MergeWhenSucceeded 1. This fixes support for merge when succeeded for statuses without ref. 2. This fixes support for merge when succeeded for multiple stages. Stages are created after all builds for previous one are finished. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/9060 https://gitlab.com/gitlab-org/gitlab-ce/issues/8108 https://gitlab.com/gitlab-org/gitlab-ce/issues/12931 https://gitlab.com/gitlab-org/gitlab-ce/issues/13269 /cc @grzesiek @DouweM @rspeicher See merge request !2894
| | * | | | | Fix Merge When Succeeded for multiple stagesKamil Trzcinski2016-02-192-10/+15
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Use around_transition to trigger build creation for next stages
| * | | | | Flush emptiness caches whenever neededYorick Peterse2016-02-201-0/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the emptiness cache (used for Repository#empty? and Repository#has_visible_content?) is flushed after comitting changes (using the web editor, API or Git) for new repositories. Once a repository is no longer empty there's no need to explicitly flush the cache for Repository#empty?. The cache for Repository#has_visible_content? in turn is already flushed whenever needed. Fixes gitlab-org/gitlab-ce#13387
| * | | | Merge branch 'visibletrap/gitlab-ce-label'Douwe Maan2016-02-191-7/+8
| |\ \ \ \
| | * | | | Label description and Label rowTap2016-02-171-7/+8
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | - Add label description - Show label row when filtering issues or merge requests by label
| * | | | Merge branch 'rs-blob' into 'master' Douwe Maan2016-02-201-0/+34
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `Blob` model that wraps `Gitlab::Git::Blob` This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG. See merge request !2887
| | * | | | Add a `Blob` model that wraps `Gitlab::Git::Blob`rs-blobRobert Speicher2016-02-181-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG.
| * | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Labels should be visible in milestone view Closes #3276 See merge request !2599
| | * | | | | 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 GenericCommitStatus This is pretty important fix. We should not release 8.5 without this. It critical error when handling GenericCommitStatus: ``` undefined method `ignored?' for #<GenericCommitStatus:0x007fe1a2a20fe0> ``` cc @grzesiek See merge request !2899
| | * | | | | | Fix missing ignored? for GenericCommitStatuscommit-status-fixKamil Trzcinski2016-02-192-4/+4
| | | | | | | |
| * | | | | | | More updates from the last code review.Rubén Dávila2016-02-192-5/+3
| | | | | | | |
| * | | | | | | Don't use `self` when looking for cross-references!Rubén Dávila2016-02-191-1/+1
| | | | | | | |
| * | | | | | | Some updates from last code review.Rubén Dávila2016-02-192-4/+4
| | | | | | | |
| * | | | | | | Make #commit_with_hooks return the new obj id plus some other fixes.Rubén Dávila2016-02-191-4/+3
| | | | | | | |
| * | | | | | | Don't show revert button if commit/MR has already been reverted.Rubén Dávila2016-02-192-6/+30
| | | | | | | |
| * | | | | | | Make more robust the test to see if a commit has been previously reverted.Rubén Dávila2016-02-191-5/+5
| | | | | | | |
| * | | | | | | Refactor commit message for revert commit.Rubén Dávila2016-02-191-3/+3
| | | | | | | |
| * | | | | | | No longer need to ignore temporary branch.Rubén Dávila2016-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Now it's only created when user choose to create a MR and logic to hide it is handled by https://gitlab.com/gitlab-org/gitlab-ce/blob/50595af7b0e304f16e2955109abd2d25cd96efda/app/helpers/application_helper.rb#L139
| * | | | | | | Use a reference to the MR when reverting MRs.Rubén Dávila2016-02-191-1/+7
| | | | | | | |
View Lorry Controller Status