summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* API: Add endpoint to delete a group shareapi-delete-group-shareRobert Schilling2016-11-231-0/+13
|
* Merge branch '24730-broken-master' into 'master' Robert Speicher2016-11-221-4/+5
|\ | | | | | | | | | | | | Fix StrongAttibutes error with Ruby 2.1 Closes #24730 See merge request !7625
| * Fix StrongAttibutes error with Ruby 2.124730-broken-masterRémy Coutable2016-11-211-4/+5
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'improve-deploy-message' into 'master' Kamil Trzciński2016-11-212-2/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve deploy message ## What does this MR do? Improves deploy message to make it more descriptive and useable then what is already offered by deploy command. ## Does this MR meet the acceptance criteria? - [ ] [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) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] 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) ## What are the relevant issue numbers? See merge request !7629
| * | Improve deploy command messageKamil Trzcinski2016-11-212-2/+20
| | |
* | | Merge branch 'dz-fix-500-group-git' into 'master' Sean McGivern2016-11-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error when group name ends with git Closes https://gitlab.com/gitlab-com/support-forum/issues/1298 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24742 See merge request !7630
| * | | Fix 500 error when group name ends with gitDmitriy Zaporozhets2016-11-211-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'chatops-deploy-command' into 'master' Rémy Coutable2016-11-214-13/+72
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add deploy chat command This adds a new ChatOps command: ``` /trigger deploy <environment> to <environment> ``` See merge request !7619
| * | | Fix specs and improve code readabilityKamil Trzcinski2016-11-211-2/+2
| | | |
| * | | Introduce deploy command that allows to start deployment from one ↵chatops-deploy-commandKamil Trzcinski2016-11-212-5/+16
| | | | | | | | | | | | | | | | environment to second one
| * | | Add deploy chat command [ci skip]Kamil Trzcinski2016-11-213-13/+61
| |/ /
* | | Merge branch 'feature/send-registry-address-with-build-payload' into 'master' Kamil Trzciński2016-11-214-0/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send registry address with build payload ## What does this MR do? Adds `registry_url` as a part of a build payload, when sending a response to a GitLab Runner which requested a new build. ## Are there points in the code the reviewer needs to double check? Change in `lib/ci/api/entities.rb`. ## Why was this MR needed? This is one of the steps needed to add support for private/protected registries hosted with GitLab CE/EE. ## Screenshots (if relevant) ## 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) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] 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) ## What are the relevant issue numbers? Related to gitlab-org/gitlab-ci-multi-runner#1828, gitlab-org/gitlab-ci-multi-runner!386, gitlab-org/gitlab-ci-multi-runner#1434 See merge request !7474
| * | | Add Gitlab::Ci::Build::Credentials module with build credentials abstractionTomasz Maczukin2016-11-214-16/+64
| | | |
| * | | Send credentials array with build dataTomasz Maczukin2016-11-212-3/+21
| | | |
| * | | Send registry_url with build data to GitLab RunnerTomasz Maczukin2016-11-161-0/+4
| | | |
* | | | Merge branch 'grapify-project-snippet-api' into 'master' Rémy Coutable2016-11-211-78/+78
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the projects snippet API Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/22928 See merge request !7621
| * | | | Grapify the projects snippet APIgrapify-project-snippet-apiRobert Schilling2016-11-211-78/+78
| | | | |
* | | | | Merge branch 'smarter-cache-invalidation' into 'master' Sean McGivern2016-11-211-0/+63
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Smarter cache invalidation Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23550 See merge request !7360
| * | | | Unify detecting of special repository filesYorick Peterse2016-11-211-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the logic of detecting special repository files (e.g. a README or a Koding configuration file) to a single class: Gitlab::FileDetector. Moving this logic into a single place allows this to be re-used more easily. This commit also changes Repository#gitlab_ci_yaml so that its cached similar to other data (e.g. the Koding configuration file).
* | | | | Merge branch 'fix/cycle-analytics-permissions' into 'master' Sean McGivern2016-11-211-0/+44
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Added permissions per stage to cycle analytics endpoint See merge request !7613
| * | | | refactored a couple of things based on feedbackfix/cycle-analytics-permissionsJames Lopez2016-11-211-12/+7
| | | | |
| * | | | Added permissions per stage to cycle analytics endpointJames Lopez2016-11-211-0/+49
| |/ / /
* | | | Merge branch 'grapify-users-api' into 'master' Rémy Coutable2016-11-211-257/+249
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the users API Certain endpoints return different entities based on which user issues the request. Right now, I am not aware how to specify multiple entities as part of the description block of the endpoint. @rymai Do you know something about that. ## What are the relevant issue numbers? Related to #22928 See merge request !7147
| * | | Grapify the users APIgrapify-users-apiRobert Schilling2016-11-211-258/+250
| | | |
* | | | Merge branch 'create-pipeline-endpoint' into 'master' Rémy Coutable2016-11-211-0/+21
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Add API endpoint for creating a pipeline Fixes #23468 See merge request !7209
| * | | Add api endpoint for creating a pipelineIdo Leibovich2016-11-181-0/+21
| | | | | | | | | | | | | | | | Add a new endpoint in the new API for creating a new pipeline, and return the details of that pipeline.
* | | | Merge branch 'fix/require-build-script-configuration-entry' into 'master' issues-copyKamil Trzciński2016-11-193-24/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make job script a required configuration entry ## What does this MR do? This MR makes a job script a required configuration entry. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Closes #24575 See merge request !7566
| * | | | Remove CI config helper with same name as an entryGrzegorz Bizon2016-11-182-8/+35
| | | | |
| * | | | Make CI job script a required configuration entryGrzegorz Bizon2016-11-181-16/+16
| | | | |
* | | | | Merge branch 'zj-rake-task-remove-faulty-deployment-refs' into 'master' Kamil Trzciński2016-11-191-0/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix faulty deployment refs In the 8.13 RC cycle, so before the release, there was a time in which references in git where stored by id instead of iid. This could be fixed by time, if the iid catches up with the id, it overwrites it. But in the mean time we have wrong refs in the folder. This commit fixes that. For all projects we have deployments we'll find the ones where the ref has a higher number than the iid is now and calls `#create_ref` on the corresponding deployment. Fixes gitlab-com/infrastructure#683 cc @ayufan One worry: I tested this locally, couldn't find a way to do automate this. See merge request !7352
| * | | | | Fix faulty deployment refszj-rake-task-remove-faulty-deployment-refsZ.J. van de Weg2016-11-181-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the 8.13 RC cycle, so before the release, there was a time in which references in git where stored by id instead of iid. This could be fixed by time, if the iid catches up with the id, it overwrites it. But in the mean time we have wrong refs in the folder. This commit fixes that. For all projects we have deployments we'll find the ones where the ref has a higher number than the iid is now and calls `#create_ref` on the corresponding deployment.
* | | | | | Merge branch 'feature/precalculate-authorized-projects' into 'master' Douwe Maan2016-11-181-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Precalculate authorized projects in database ## What does this MR do? It caches user's authorized projects in database instead of using multiple unions, which should simplify and speed-up things since this operation (getting authorized projects) is used a lot. ## Are there points in the code the reviewer needs to double check? Did we miss a scenario where we need to refresh the list of projects? ## Does this MR meet the acceptance criteria? - [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)~~ - [ ] ~~API support added~~ - 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #23150 See merge request !6839
| * | | | | | Precalculate user's authorized projects in databaseAhmad Sherif2016-11-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #23150
* | | | | | | Merge branch 'zj-slash-commands-mattermost' into 'master' Kamil Trzciński2016-11-188-5/+313
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Fix typosZ.J. van de Weg2016-11-181-3/+4
| | | | | | | |
| * | | | | | | Return a consistent not found messageZ.J. van de Weg2016-11-182-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents leakage of project names on an endpoint which is unauthenticated and thus open to the world.
| * | | | | | | Improve style, add more testsZ.J. van de Weg2016-11-184-19/+12
| | | | | | | |
| * | | | | | | More coverage on service levelZ.J. van de Weg2016-11-183-7/+15
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into zj-slash-commands-mattermostZ.J. van de Weg2016-11-179-57/+81
| |\ \ \ \ \ \ \
| * | | | | | | | More refactoring, push present to base commandZ.J. van de Weg2016-11-176-46/+67
| | | | | | | | |
| * | | | | | | | Add tests for increased converageZ.J. van de Weg2016-11-175-17/+20
| | | | | | | | |
| * | | | | | | | Remove some commands for nowZ.J. van de Weg2016-11-177-79/+11
| | | | | | | | |
| * | | | | | | | Incorporate feedback, improve presenter classZ.J. van de Weg2016-11-178-55/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Rename from service, and move to lib/gitlabZ.J. van de Weg2016-11-1710-4/+225
| | | | | | | | |
| * | | | | | | | Refactor and test Slash commandsZ.J. van de Weg2016-11-171-37/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the structure Kamil proposed, which leaves us with a bunch of smaller classes. This commits deletes outdated files and tests everything from the SlashCommandService and down (child classes and subcommands)
| * | | | | | | | First steps on refactoring Mattermost Slash commandsZ.J. van de Weg2016-11-171-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-171-3/+26
| | | | | | | | |
| * | | | | | | | Add most of specs for chat namesKamil Trzcinski2016-11-171-1/+1
| | | | | | | | |
| * | | | | | | | Create relation between chat user and GitLab user and allow to authorize ↵Kamil Trzcinski2016-11-171-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | them [ci skip]
* | | | | | | | | Merge branch 'bugfix/html-only-mail' into 'master' Douwe Maan2016-11-182-6/+47
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add parsing support for incoming html email ## What does this MR do? Fixes #18388 by adding support for parsing HTML email ## Are there points in the code the reviewer needs to double check? The new class, Gitlab::Email::HTMLParser, which needs to translate the HTML content to text and also delete replies, as they are not necessarily in the correct format to be caught by EmailReplyParser. The solution I found that should work for any HTML-formatted email is to remove all `<table>` and `<blockquote>` tags. Actual `<table>` elements (to be interpreted by markdown) should already be encoded with e.g. `&lt;table&gt;` - the only failure mode is if there is an *actual* HTML table in the content itself, which we wouldn't be able to support easily anyways. The gem `html2text` traverses the HTML tree and outputs text - and markdown in the case of HTML links or images. See merge request !7397