summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'zj-fix-trailing-whitespace-issue-create' into 'master' Kamil Trzciński2016-11-221-2/+4
|\ | | | | | | | | Issue creation now accepts trailing whitespace See merge request !7633
| * Issue creation now accepts trailing whitespacezj-fix-trailing-whitespace-issue-createZ.J. van de Weg2016-11-221-2/+4
| |
* | Merge branch 'fix/ci-linter-undefined-error' into 'master' Kamil Trzciński2016-11-221-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined error in CI linter ## What does this MR do? This MR fixes undefined error in CI linter. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] Tests added for this feature/bug ## What are the relevant issue numbers? Closes #24759 See merge request !7650
| * Fix entry lookup in CI config inheritance rulesGrzegorz Bizon2016-11-221-1/+1
| |
* | Merge branch 'improve-deploy-message' into 'master' Kamil Trzciński2016-11-211-1/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-1/+14
| | |
* | | 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-213-0/+50
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Add deploy chat command This adds a new ChatOps command: ``` /trigger deploy <environment> to <environment> ``` See merge request !7619
| * | 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-212-0/+39
| |/
* | Merge branch 'feature/send-registry-address-with-build-payload' into 'master' Kamil Trzciński2016-11-213-0/+64
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-0/+16
| | |
* | | 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).
* | | 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 '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 '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-185-0/+168
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Improve style, add more testsZ.J. van de Weg2016-11-181-3/+3
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into zj-slash-commands-mattermostZ.J. van de Weg2016-11-172-1/+2
| |\ \ \ \
| * | | | | More refactoring, push present to base commandZ.J. van de Weg2016-11-174-25/+31
| | | | | |
| * | | | | Add tests for increased converageZ.J. van de Weg2016-11-174-15/+17
| | | | | |
| * | | | | Remove some commands for nowZ.J. van de Weg2016-11-176-73/+5
| | | | | |
| * | | | | Incorporate feedback, improve presenter classZ.J. van de Weg2016-11-176-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Rename from service, and move to lib/gitlabZ.J. van de Weg2016-11-179-0/+222
| | | | | |
| * | | | | 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
| * | | | | | fix indentation for rubocophttp://jneen.net/2016-11-171-3/+3
| | | | | | |
| * | | | | | rename `part` variable and guard against nil content_typehttp://jneen.net/2016-11-171-7/+5
| | | | | | |
| * | | | | | completely remove blockquote and table tagshttp://jneen.net/2016-11-171-2/+2
| | | | | | |
| * | | | | | use Nokogiri::HTML.parse instead of capitalized methodhttp://jneen.net/2016-11-171-1/+1
| | | | | | |
| * | | | | | fix rubocop failureshttp://jneen.net/2016-11-171-1/+4
| | | | | | |
| * | | | | | add parsing support for incoming html emailhttp://jneen.net/2016-11-172-5/+45
| |/ / / / /
* | | | | | Merge branch 'feature/cycle-analytics-events' into 'master' Douwe Maan2016-11-1816-12/+487
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | refactored updater and updated specsJames Lopez2016-11-185-27/+9
| | | | | |
| * | | | | added new build updater, specs and refactored allowed_idsJames Lopez2016-11-1810-40/+75
| | | | | |
| * | | | | refactor eventsJames Lopez2016-11-181-17/+3
| | | | | |
| * | | | | fix blank state errorJames Lopez2016-11-171-1/+3
| | | | | |
| * | | | | preload ids or objects for users, merge request and issuesJames Lopez2016-11-176-19/+56
| | | | | |
| * | | | | more refactoring and added some auth checksJames Lopez2016-11-1711-124/+161
| | | | | |
| * | | | | fix typo in error messageJames Lopez2016-11-171-1/+1
| | | | | |
| * | | | | remove class no longer requiredJames Lopez2016-11-171-13/+0
| | | | | |
| * | | | | fix integration specJames Lopez2016-11-171-1/+1
| | | | | |