summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'zj-slash-commands-mattermost' into 'master' Kamil Trzciński2016-11-185-2/+88
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slash command for mattermost Closes #22540 ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) See merge request !7438
| * Rename mattermost_command to mattermost_slash_commandszj-slash-commands-mattermostKamil Trzcinski2016-11-183-4/+4
| |
| * Fix typosZ.J. van de Weg2016-11-181-1/+1
| |
| * Return a consistent not found messageZ.J. van de Weg2016-11-181-1/+1
| | | | | | | | | | This prevents leakage of project names on an endpoint which is unauthenticated and thus open to the world.
| * Projects have chat servicesZ.J. van de Weg2016-11-181-0/+1
| |
| * Merge remote-tracking branch 'origin/master' into zj-slash-commands-mattermostZ.J. van de Weg2016-11-1711-63/+105
| |\
| * | More refactoring, push present to base commandZ.J. van de Weg2016-11-172-5/+5
| | |
| * | Incorporate feedback, improve presenter classZ.J. van de Weg2016-11-173-13/+23
| | | | | | | | | | | | [ci skip]
| * | First steps on refactoring Mattermost Slash commandsZ.J. van de Weg2016-11-171-23/+2
| | | | | | | | | | | | | | | Now, each subcommand has its own service, plus I've introduced presenters to be able to delegate the generation of the views.
| * | Make chat authorization to work [ci skip]Kamil Trzcinski2016-11-174-12/+36
| | |
| * | Remove duplication of implementationsZ.J. van de Weg2016-11-172-2/+3
| | |
| * | Create relation between chat user and GitLab user and allow to authorize ↵Kamil Trzcinski2016-11-172-0/+65
| | | | | | | | | | | | them [ci skip]
| * | fixup! issue and mergerequest slash command for mattermostZ.J. van de Weg2016-11-171-1/+1
| | |
| * | issue and mergerequest slash command for mattermostZ.J. van de Weg2016-11-172-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit includes a couple of thing: - A chatops controller - Mattermost::CommandService - Mattermost::Commands::(IssueService|MergeRequestService) The controller is the point where mattermost, and later slack will have to fire their payload to. This in turn will execute the CommandService. Thats where the authentication and authorization should happen. So far this is not yet implemented. This should happen in later commits. Per subcommand, in case of `/gitlab issue show 123` issue whould be the subcommand, there is a service to parse the data, and fetch the resource. The resource is passed back to the CommandService which structures the data.
| * | Create relation between chat user and GitLab user and allow to authorize ↵Kamil Trzcinski2016-11-172-0/+13
| | | | | | | | | | | | them [ci skip]
* | | Merge branch '23205-information-about-environments-build-page' into 'master' Fatih Acet2016-11-181-0/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add environment info to builds page ![Screen_Shot_2016-11-02_at_5.44.01_PM](/uploads/3443d9518997147d1e6f41830e3774ff/Screen_Shot_2016-11-02_at_5.44.01_PM.png) Closes #23205 See merge request !7251
| * | | Fix tests and add has_environment?Kamil Trzcinski2016-11-171-3/+7
| | | |
| * | | Improve specs and add missing cases that were not supportedKamil Trzcinski2016-11-171-2/+18
| | | |
| * | | Expose `last_deployment` on `Ci::Builds` [ci skip]Kamil Trzcinski2016-11-081-3/+7
| | | |
| * | | Add switch statement & last_deployment methodAnnabel Dunstone Gray2016-11-081-0/+6
| | | |
* | | | Merge branch 'pass-correct-tag-target-to-post-receive' into 'master' Sean McGivern2016-11-181-3/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass correct tag target to post-receive hook when creating tag via UI Fixes #24437 See merge request !7556
| * | | | Pass correct tag target to post-receive hook when creating tag via UIpass-correct-tag-target-to-post-receiveAdam Niedzielski2016-11-181-3/+10
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to handle annotated tags that are created via GitLab UI. Annotated tags have their own SHA. We have to pass this SHA to post-receive hook to mirror what happens when someone creates an annotated tag in their local repository and pushes it via command line. In order to obtain tag SHA we first have to create it. This is a bit confusing because we create the tag before executing pre-hooks, but there is no way to create a tag outside the repository. If pre-hooks fail we have to clean up after ourselves.
* | | | Merge branch 'issue_13232' into 'master' Sean McGivern2016-11-181-35/+79
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add JIRA remotelinks and prevent duplicated closing messages implements #13232 closes #20479 See merge request !7413
| * | | | Add JIRA remotelinks and prevent duplicated closing messagesFelipe Artur2016-11-181-35/+79
| | | | |
* | | | | Merge branch 'feature/cycle-analytics-events' into 'master' Douwe Maan2016-11-182-56/+9
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cycle Analytics: Events per stage Adds list of events to each stage: - Issue: list of issues created in the last XX days, that have been labeled or added to a milestone. - Plan: list of commits that reference for the fist time an issue from the last stage. - Code: list of MR created in this stage - Test: List of unique builds triggered by the commits. - Review: List of MR merged - Staging: List of deployed builds - Production: list of issues with the time from idea to production Fixes #23449 - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6859
| * | | | refactor events facade so it uses separate classes and refactor query stuffJames Lopez2016-11-171-9/+8
| | | | |
| * | | | Renamed pipeline column and fixed permissions for builds in events controllerJames Lopez2016-11-171-1/+1
| | | | |
| * | | | Added test events specs and logic. Also fixed some SQL and refactored the ↵James Lopez2016-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | pipeline worker spec.
| * | | | add pipeline id to merge request metrics table. Also, updated the pipeline ↵James Lopez2016-11-172-1/+2
| | | | | | | | | | | | | | | | | | | | worker to populate this field.
| * | | | Started refactoring stuff to add events to cycle analyticsJames Lopez2016-11-171-48/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refactored cycle analytics class to extract DB logic - Reuse logic in new events fetcher - Started adding cycle analytics events class and spec (still not functional)
* | | | | Merge branch 'feature/subscribe-to-group-level-labels' into 'master' Sean McGivern2016-11-174-21/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support subscribing to group labels https://gitlab.com/gitlab-org/gitlab-ce/issues/23586 See merge request !7215
| * | | | | Allow users to subscribe to a group label at group or project levelDouglas Barbosa Alexandre2016-11-171-4/+23
| | | | | |
| * | | | | Allow subscriptions to be created without a projectDouglas Barbosa Alexandre2016-11-172-10/+17
| | | | | |
| * | | | | Remove default value for `project` argument on subscribable concernDouglas Barbosa Alexandre2016-11-172-18/+16
| | | | | |
| * | | | | Refactoring Subscribable concern to accept a projectDouglas Barbosa Alexandre2016-11-172-17/+23
| | | | | |
| * | | | | Add unique index to subscriptions on subscribable and user and projectDouglas Barbosa Alexandre2016-11-171-2/+2
| | | | | |
| * | | | | Add project_id to subscriptionsDouglas Barbosa Alexandre2016-11-171-0/+3
| | | | | |
* | | | | | Merge branch 'chat-name-authorize' into 'master' Rémy Coutable2016-11-172-0/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to authorize chat user against GitLab. This is needed for: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7438 See merge request !7450
| * | | | | Merge remote-tracking branch 'origin/master' into chat-name-authorizeKamil Trzcinski2016-11-167-18/+53
| |\ \ \ \ \
| * | | | | | Create relation between chat user and GitLab user and allow to authorize ↵Kamil Trzcinski2016-11-162-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | them [ci skip]
* | | | | | | Merge branch 'jira_service_simplify' into 'master' Sean McGivern2016-11-171-10/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JiraService: simplify url generation Fixes #24085 See merge request !7307
| * | | | | | | simplify url generationJarka Kadlecova2016-11-051-10/+8
| | | | | | | |
* | | | | | | | Merge branch 'feature/environment-teardown-when-branch-deleted' into 'master' Kamil Trzciński2016-11-173-16/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop environment when branch is deleted ## What does this MR do? This MR adds a environment teardown service, that is called when user deletes a branch. This most often happens when merge requests is merged. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Closes #23218 See merge request !7355
| * | | | | | | | Add specs for environments recently updated on branchGrzegorz Bizon2016-11-161-1/+1
| | | | | | | | |
| * | | | | | | | Refactor methods for environments in project modelGrzegorz Bizon2016-11-162-6/+13
| | | | | | | | |
| * | | | | | | | Improve readability in project model for environmentsGrzegorz Bizon2016-11-161-2/+2
| | | | | | | | |
| * | | | | | | | Select recently updated environments for auto-closeGrzegorz Bizon2016-11-152-2/+6
| | | | | | | | |
| * | | | | | | | Add feature tests for environments auto-closeGrzegorz Bizon2016-11-151-0/+1
| | | | | | | | |
| * | | | | | | | Do not call environments service in repository modelGrzegorz Bizon2016-11-111-13/+2
| | | | | | | | |
| * | | | | | | | Stop environments for branch after branch removalGrzegorz Bizon2016-11-092-4/+15
| | | | | | | | |
View Lorry Controller Status