summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Backport Note#commands_changes from EEbackport-commands-paramsDouwe Maan2016-11-241-0/+3
|
* Merge branch 'rs-project-team-helpers' into 'master' Sean McGivern2016-11-222-0/+17
|\ | | | | | | | | | | | | Add shortcuts for adding users to a project team with a specific role Closes #20944 See merge request !7565
| * Add shortcuts for adding users to a project team with a specific rolers-project-team-helpersRobert Speicher2016-11-182-0/+17
| | | | | | | | | | | | | | | | | | | | This also updates _some_ specs to use these new methods, just to serve as an example for others going forward, but by no means is this exhaustive. Original implementations at !5992 and !6012. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20944
* | Merge branch 'revert-a0d5bb0b' into 'master' Achilleas Pipinellis2016-11-221-3/+3
|\ \ | | | | | | | | | | | | Revert "Merge branch 'docs/jira-old' into 'master'" See merge request !7531
| * | Change documentation link in JIRA servicerevert-a0d5bb0bAchilleas Pipinellis2016-11-221-3/+3
| | |
* | | Merge branch 'zj-mattermost-command-help-message' into 'master' Fatih Acet2016-11-221-7/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add help section for MM commands ## What should this MR do Check @pedroms' design for the Mattermost service screen: https://gitlab.com/gitlab-org/gitlab-ce/issues/22540 Now this has to be implemented, I've created a clean canvas for you, @lbennett, to draw on. ## 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 - [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) See merge request !7558
| * | | Improve the mattermost help boxZ.J. van de Weg2016-11-211-7/+0
| | | | | | | | | | | | | | | | Also added tests, and moved the slack test to a better location.
* | | | Merge branch 'fix-failed-email-for-external-jobs' into 'master' Kamil Trzciński2016-11-221-3/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | External jobs do not have show page nor traces Fixes #24677 See merge request !7617
| * | | Move has_trace? to CommitStatus than GenericCommitStatusLin Jen-Shin2016-11-222-7/+7
| | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18762721
| * | | Use has_trace? instead of case switch, feedback:Lin Jen-Shin2016-11-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18745170 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18745221
* | | | Merge branch 'chatops-deploy-command' into 'master' Rémy Coutable2016-11-211-1/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-2/+2
| | | | | | | | | | | | | | | | | | | | environment to second one
| * | | | Add deploy chat command [ci skip]Kamil Trzcinski2016-11-211-1/+9
| | |/ / | |/| |
* | | | Merge branch 'feature/send-registry-address-with-build-payload' into 'master' Kamil Trzciński2016-11-211-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-8/+1
| | | | |
| * | | | Send credentials array with build dataTomasz Maczukin2016-11-211-0/+11
| | | | |
* | | | | Merge branch 'hide-empty-merge-request-diffs' into 'master' Sean McGivern2016-11-211-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix errors happening when source branch of merge request is removed and then restored See merge request !7568
| * | | | | Hide empty merge request diffs when comparing versionsAdam Niedzielski2016-11-211-2/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'smarter-cache-invalidation' into 'master' Sean McGivern2016-11-213-191/+221
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smarter cache invalidation Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23550 See merge request !7360
| * | | | | Refactor cache refreshing/expiringYorick Peterse2016-11-212-185/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors repository caching so it's possible to selectively refresh certain caches, instead of just expiring and refreshing everything. To allow this the various methods that were cached (e.g. "tag_count" and "readme") use a similar pattern that makes expiring and refreshing their data much easier. In this new setup caches are refreshed as follows: 1. After a commit (but before running ProjectCacheWorker) we expire some basic caches such as the commit count and repository size. 2. ProjectCacheWorker will recalculate the commit count, repository size, then refresh a specific set of caches based on the list of files changed in a push payload. This requires a bunch of changes to the various methods that may be cached. For one, data should not be cached if a branch used or the entire repository does not exist. To prevent all these methods from handling this manually this is taken care of in Repository#cache_method_output. Some methods still manually check for the existence of a repository but this result is also cached. With selective flushing implemented ProjectCacheWorker no longer uses an exclusive lease for all of its work. Instead this worker only uses a lease to limit the number of times the repository size is updated as this is a fairly expensive operation.
| * | | | | Use File.exist? to check if a repository existsYorick Peterse2016-11-211-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initializing Rugged objects is way too expensive just to check if a repository exists. Even though we cache this data once in a while we have to refresh this. On GitLab.com we have seen Repository#exists? taking up to _1 minute_ to complete in the absolute worst case, though usually it sits around a second or so. Using File.exist? to instead check if $GIT_DIR/refs exists is a much faster way of checking if a repository was initialized properly.
| * | | | | Unify detecting of special repository filesYorick Peterse2016-11-212-16/+16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'issue_24303' into 'master' Sean McGivern2016-11-213-15/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow JIRA references for project snippets closes #24303 See merge request !7541
| * | | | | Allow JIRA references for project snippetsissue_24303Felipe Artur2016-11-213-15/+18
| | | | | |
* | | | | | Merge branch 'fix/cycle-analytics-permissions' into 'master' Sean McGivern2016-11-211-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+3
| | | | | | |
| * | | | | | Added permissions per stage to cycle analytics endpointJames Lopez2016-11-211-1/+8
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch ↵Kamil Trzciński2016-11-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-running' into 'master' Resolve "MR shows "The build for this merge request failed" although builds still running" Closes #24616 See merge request !7579
| * | | | | | Fix a wrong "The build for this merge request failed" message24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-runningRémy Coutable2016-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also allow merge request to be merged with skipped pipeline and the "only allow merge when pipeline is green" feature enabled Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'fix/do-not-add-todo-when-build-allowed-to-fail' into 'master' 24710-external-statuses-pipelineKamil Trzciński2016-11-211-1/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not create TODO when build is allowed to fail ## What does this MR do? Do not create a TODO when build that failed is allowed to fail. ## 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) - Tests - [x] Added for this feature/bug - [ ] All builds are passing ## What are the relevant issue numbers? Closes #22280 See merge request !7618
| * | | | | | Do not create TODO when build is allowed to failGrzegorz Bizon2016-11-211-1/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ee-870-backport' into 'master' Sean McGivern2016-11-211-0/+11
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Backport some changes done from Time Tracking feature in EE. See merge request !7604
| * | | | | Backport some changes done from Time Tracking feature in EE.ee-870-backportRuben Davila2016-11-181-0/+11
| | | | | |
* | | | | | Merge branch 'issue_5541' into 'master' Sean McGivern2016-11-212-24/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to block JIRA events for commits and merge requests implements #5541 See merge request !7469
| * | | | | Allow enabling and disabling commit and MR events for JIRAissue_5541Felipe Artur2016-11-182-24/+20
| | | | | |
* | | | | | Merge branch 'remove-unnecessary-self-from-user-model' into 'master' Rémy Coutable2016-11-211-54/+53
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary self from user model self keyword nod needed. Code is more clean and understandable. https://github.com/bbatsov/ruby-style-guide#no-self-unless-required See merge request !7551
| * | | | | Remove unnecessary self from user modelSemyon Pupkov2016-11-191-54/+53
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-slack-pipeline-event' into 'master' Kamil Trzciński2016-11-191-4/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline author for Slack and use pipeline id for pipeline link [Context](https://gitlab.slack.com/archives/runner-builds/p1479238493000018) Pipeline Slack message: > gitlab-org/gitlab-ci-multi-runner: Pipeline 8bed2a3b of fix/handle-failed-state-while-patching-trace branch by failed in 1389 seconds Quotes: > @godfat Take a look at these notifications, they seems to be missing author and should probably use Pipeline ID instead of SHA See merge request !7506
| * | | | | Fix pipeline author for Slack and use pipeline idLin Jen-Shin2016-11-161-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | rather than using SHA for the pipeline link.
* | | | | | Merge branch 'feature/precalculate-authorized-projects' into 'master' Douwe Maan2016-11-187-47/+102
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-187-47/+102
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Closes #23150
* | | | | | 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.