summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Improve performance of MR show pageDouwe Maan2016-08-183-4/+5
* Fix MR note discussion IDDouwe Maan2016-08-181-1/+3
* Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-181-3/+4
|\
| * Merge branch '17334-u2f-device-identifiers' into 'master' Robert Speicher2016-08-181-3/+4
| |\
| | * Allow naming U2F devices.Timothy Andrew2016-08-181-3/+4
* | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-182-1/+5
|\ \ \ | |/ /
| * | Merge branch '18141-pipeline-graph' into 'master' Jacob Schatz2016-08-172-1/+5
| |\ \
| | * \ Merge master into branchAnnabel Dunstone2016-08-173-3/+44
| | |\ \
| | * | | Split pipeline status item for Commit Status and BuildKamil Trzcinski2016-08-171-2/+2
| | * | | Merge remote-tracking branch 'origin/master' into 18141-pipeline-graphKamil Trzcinski2016-08-1728-155/+387
| | |\ \ \
| | * | | | Fix pipelines visualisation renderingKamil Trzcinski2016-08-172-1/+5
* | | | | | Fix class method definitionDouwe Maan2016-08-171-1/+1
* | | | | | Fix a lingering conflict.Connor Shea2016-08-171-5/+1
* | | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-178-2/+117
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'issue-boards' into 'master' Douwe Maan2016-08-175-0/+50
| |\ \ \ \ \
| | * | | | | Add a movable scope and a movable? method to List modelDouglas Barbosa Alexandre2016-08-171-0/+5
| | * | | | | Add a destroyable scope and a destroyable? method to List modelDouglas Barbosa Alexandre2016-08-171-2/+8
| | * | | | | Remove useless delegate method on List modelDouglas Barbosa Alexandre2016-08-171-3/+1
| | * | | | | Move action to render board lists to `Projects::Boards::ListsController`Douglas Barbosa Alexandre2016-08-171-0/+2
| | * | | | | Turn board for public projects accessible to everyoneDouglas Barbosa Alexandre2016-08-171-0/+1
| | * | | | | Add authorization to issues board related controllersDouglas Barbosa Alexandre2016-08-171-0/+2
| | * | | | | Destroy related lists when a label is removedDouglas Barbosa Alexandre2016-08-171-0/+2
| | * | | | | Ensure that we have only one list per label per boardDouglas Barbosa Alexandre2016-08-171-0/+1
| | * | | | | The lists: Backlog, and Done cannot be destroyedDouglas Barbosa Alexandre2016-08-172-1/+9
| | * | | | | Title of a list is either the label name, or Backlog, or DoneDouglas Barbosa Alexandre2016-08-171-0/+6
| | * | | | | Order board lists by list_type, and positionDouglas Barbosa Alexandre2016-08-172-5/+5
| | * | | | | Add Board modelDouglas Barbosa Alexandre2016-08-173-0/+19
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'custom-events-tracking' into 'master' Douwe Maan2016-08-171-0/+20
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Tracking of custom eventscustom-events-trackingYorick Peterse2016-08-171-0/+20
| | |/ / /
| * | | | Merge branch 'mc-ui'Douwe Maan2016-08-173-3/+33
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into mc-uiSean McGivern2016-08-1716-16/+126
| | |\ \ \ \ | | | |/ / /
| | * | | | Merge branch 'master' into mc-uiDouwe Maan2016-08-157-6/+60
| | |\ \ \ \
| | * | | | | Verify user is signed in and can actually resolve conflictsDouwe Maan2016-08-121-0/+5
| | * | | | | Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?`Douwe Maan2016-08-121-5/+7
| | * | | | | Move resolving code to ResolveServiceSean McGivern2016-08-121-0/+8
| | * | | | | Don't allow resolving invalid conflictsSean McGivern2016-08-122-5/+20
| | * | | | | Fix merge conflict reading for new diffsSean McGivern2016-08-121-2/+2
| * | | | | | Merge branch '18681-pipelines-merge-request' into 'master' Jacob Schatz2016-08-171-0/+11
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Annabel Dunstone2016-08-164-12/+18
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Kamil Trzcinski2016-08-1640-243/+828
| | |\ \ \ \ \ \
| | * | | | | | | Properly select a list of Pipelines for a Merge RequestsKamil Trzcinski2016-08-121-0/+11
* | | | | | | | | Store discussion_id on Note for faster discussion lookup.Douwe Maan2016-08-175-35/+68
* | | | | | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-172-0/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Move to project dropdown with infinite scroll for better performance17932-move-to-project-dropdown-improvePaco Guzman2016-08-172-0/+9
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1621-22/+177
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-...Kamil Trzcinski2016-08-168-12/+91
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Backport changes from gitlab-org/gitlab-ee!581 to CE.Timothy Andrew2016-08-164-12/+18
| | | |/ / / / | | |/| | | |
| | * | | | | Further refactor and syntax fixes.Patricio Cano2016-08-153-39/+17
| | * | | | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-152-50/+31
| | * | | | | Allow `Issue` to be submitted as spamPatricio Cano2016-08-151-3/+15