summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'bvl-multiple-codeowner-approval-rules-ce' into 'master'Rémy Coutable2019-02-141-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a scope to preload emails on a user See merge request gitlab-org/gitlab-ce!25051
| * | | | Add a scope to preload emails on a userBob Van Landuyt2019-02-081-0/+1
| | | | |
* | | | | Merge branch '30299-fix-polling-for-transformed-notes' into 'master'Douwe Maan2019-02-132-4/+6
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Fix polling for transformed individual notes See merge request gitlab-org/gitlab-ce!25084
| * | | | Fix polling for transformed individual notes30299-fix-polling-for-transformed-notesHeinrich Lee Yu2019-02-132-4/+6
| | |/ / | |/| | | | | | | | | | | | | | Sets `updated_at` so that the transformed note is returned together with the new reply
* | | | Support `only: changes:` on MR pipelinesHiroyuki Sato2019-02-131-1/+10
| | | |
* | | | Add support for FTP assets for releasesRobert Schilling2019-02-131-1/+1
|/ / / | | | | | | | | | Extend the list of supported protocols to include FTP.
* | | Remove fast_destroy_uploads feature flagJan Provaznik2019-02-121-30/+4
| | | | | | | | | | | | Fast destroy of uploads was successfully enabled and test.
* | | Merge branch 'add-client-for-count-diverging-commits' into 'master'Grzegorz Bizon2019-02-121-3/+6
|\ \ \ | | | | | | | | | | | | | | | | add client support for CountDivergingCommits rpc See merge request gitlab-org/gitlab-ce!24287
| * | | Add client support for count diverging commitsJohn Cai2019-02-061-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the client call for the gitaly rpc CountDivergingCommits fixing signature simplifying commit logic adding test for max-count refactoring tests
* | | | Adding convenience method to project modelJohn Cai2019-02-111-0/+4
| | | |
* | | | Merge branch '52424-goodbye-hipchat' into 'master'Douglas Barbosa Alexandre2019-02-113-313/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove HipChat integration from GitLab Closes #52424 See merge request gitlab-org/gitlab-ce!22223
| * | | | Remove HipChat integration from GitLabNick Thomas2019-02-083-313/+0
| | | | |
* | | | | Merge branch 'fix_deployment_service_predefined_variables' into 'master'Nick Thomas2019-02-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add missing argument to DeploymentService#predefined_variables See merge request gitlab-org/gitlab-ce!24989
| * | | | | Add missing argument to DeploymentService#predefined_variablesfix_deployment_service_predefined_variablesJames Fargher2019-02-081-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch '55447-validate-k8s-ca-cert' into 'master'Dmitriy Zaporozhets2019-02-111-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Validate k8s CA certificate at cluster creation See merge request gitlab-org/gitlab-ce!24990
| * | | | Validate kubernetes cluster CA certificate55447-validate-k8s-ca-certTiger2019-02-081-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | No certificate is still accepted, but if one is provided it must be valid. Only run validation if the certificate has changed to avoid making existing records invalid.
* | | | Merge branch 'remove_make_updated_cluster_applications' into 'master'Douglas Barbosa Alexandre2019-02-081-5/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Remove #make_updated! as have #make_installed! now Closes #57374 See merge request gitlab-org/gitlab-ce!24988
| * | | Remove #make_updated! as have #make_installed! nowremove_make_updated_cluster_applicationsThong Kuah2019-02-081-5/+0
| | |/ | |/| | | | | | | | | | We can have multiple and conditional transistions in a event, so make use of that.
* | | Merge branch '57397-fixes-technical-debt-for-cluster-domain' into 'master'Grzegorz Bizon2019-02-082-2/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fixes technical debt issues for cluster domain Closes #57397 See merge request gitlab-org/gitlab-ce!25010
| * | Fixes technical debt issues for cluster domain57397-fixes-technical-debt-for-cluster-domainMayra Cabrera2019-02-072-2/+4
| | | | | | | | | | | | | | | | | | | | | - Avoid using direct code on spec migration - Removes milestone and point to issue, to avoid making fake promises Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57397
* | | Upgrade cluster applications, starting with runnerThong Kuah2019-02-073-6/+17
| | |
* | | Merge branch 'master' into ↵Sean McGivern2019-02-079-8/+83
|\ \ \ | |/ / | | | | | | fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week
| * | Merge branch '52363-ui-changes-to-cluster-and-ado-pages' into 'master'Grzegorz Bizon2019-02-073-1/+45
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Moves domain setting to Clusters page Closes #52363 See merge request gitlab-org/gitlab-ce!24580
| | * | Addresses UX and BE comments:52363-ui-changes-to-cluster-and-ado-pagesMayra Cabrera2019-02-061-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | - Changes help text on clusters form to make it more explicit. - Removes unnecessary warnings on auto devops form - Simplifies cluster methods logic
| | * | Addresses backend/db review commentsMayra Cabrera2019-02-042-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes multiple typos on AutoDevops script - Add an alias to Clusters::Cluster#domain as base_domain, so it's more descriptive - Removes unnecessary memoization on qa specs - Changes migration to a post migration to deal better with traffic on big instances (like gitlab.com)
| | * | Moves domain setting to Cluster settingMayra Cabrera2019-02-043-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes domain field to be on the Cluster page show, removing it from Auto DevOps setting. Also injects the new environment variable KUBE_INGRESS_BASE_DOMAIN into kubernetes#predefined_variables. Migration to move the information from ProjectAutoDevops#domain to Clusters::Cluster#domain. As well as necessary modifications to qa selectors Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52363
| * | | Merge branch 'local-markdown-version' into 'master'Douglas Barbosa Alexandre2019-02-072-2/+28
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Add local markdown version Closes #32789 See merge request gitlab-org/gitlab-ce!24822
| | * | Add local markdown versionlocal-markdown-versionJan Provaznik2019-02-062-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | Cached markdown version is composed both from global and local markdown version. This allows admins to bump version locally when needed (e.g. when external URL is changed).
| * | | Merge branch 'sh-log-project-name-with-gitaly' into 'master'Rémy Coutable2019-02-064-5/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send project name with Gitaly repository requests Closes gitaly#1394 See merge request gitlab-org/gitlab-ce!23373
| | * | | Use Project#full_path instead of Project#path_with_namespaceStan Hu2019-02-051-1/+2
| | | | |
| | * | | Add convenience methods for creating project and Wiki repositoriesStan Hu2019-02-052-2/+2
| | | | | | | | | | | | | | | | | | | | This makes it easier to access other project arguments in the future.
| | * | | Send project name with Gitaly repository requestsStan Hu2019-02-054-5/+9
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | When hashed storage is in use, it's helpful to have the project name associated with the request. Closes https://gitlab.com/gitlab-org/gitaly/issues/1394
* | | | Rename setting, fix wordingsFabian Schneider2019-02-061-1/+1
| | | |
* | | | Add setting for first day of the weekFabian Schneider2019-02-062-0/+4
|/ / /
* | | Avoid race conditions when creating GpgSignatureBob Van Landuyt2019-02-062-1/+12
| | | | | | | | | | | | This avoids race conditions when creating GpgSignature.
* | | Allow custom squash commit messagesLuke Duncalfe2019-02-064-5/+20
| | |
* | | Merge branch ↵Filipa Lacerda2019-02-061-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43681-display-last-activity-and-created-at-datetimes-for-users-in-admin-users' into 'master' Resolve "Display last activity and created at datetimes for users" Closes #43681 See merge request gitlab-org/gitlab-ce!24181
| * | | Add last activity to user administrationBrandon Labuschagne2019-02-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The columns 'Created on' and 'Last activity' have been added to the admin -> users view. Sorting options have also been added for last activity and the search bar has been moved to match the issues page.
* | | | Merge branch 'cluster_application_version_updated' into 'master'Grzegorz Bizon2019-02-061-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update version column on updated and installed See merge request gitlab-org/gitlab-ce!24810
| * | | | Update version on :installed, not :installingThong Kuah2019-02-071-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes this consistent with :updated. And also avoids a potential issue where an install errors which means that that the recorded version won't necessarily reflect the version that is actually installed.
| * | | | Update version column after application is updatedThong Kuah2019-02-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: updating version column after :updating is not ideal in the updating -> update_erroed case. This will mean that the application now records the version as the version that failed to upgrade, not the version that it is currently on.
* | | | | Merge branch 'introduce-environment-search-endpoint' into 'master'Sean McGivern2019-02-061-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Introduce Internal API for searching environment names See merge request gitlab-org/gitlab-ce!24923
| * | | | | Inroduce Internal API for searching environment namesintroduce-environment-search-endpointShinya Maeda2019-02-061-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog Rename word to query User hash for limit Do not allow control limit Rename pluck names and add more specs
* | | | | | Add reply to notes to turn into discussionsHeinrich Lee Yu2019-02-064-22/+32
|/ / / / /
* | | | | Merge branch '52568-external-mr-diffs' into 'master'Sean McGivern2019-02-062-11/+119
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Allow merge request diffs to be placed into an object store Closes #52568 See merge request gitlab-org/gitlab-ce!24276
| * | | | Allow MR diffs to be placed into an object storeNick Thomas2019-02-052-11/+119
| | | | |
* | | | | Merge branch 'use-deployment-relation-to-fetch-environment-ce' into 'master'Stan Hu2019-02-051-2/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport: Optimize slow pipelines.js response See merge request gitlab-org/gitlab-ce!24890
| * | | | | Backport: Optimize slow pipelines.js responseShinya Maeda2019-02-051-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | Add changelog
* | | | | | Merge branch 'bvl-codeowner-rules-model-ce' into 'master'Sean McGivern2019-02-051-0/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Adds helper for `find_or_create_by` in transaction See merge request gitlab-org/gitlab-ce!24913
| * | | | | Adds helper for `find_or_create_by` in transactionBob Van Landuyt2019-02-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | This allows us to call `find_or_create_by` on all models and scopes.
View Lorry Controller Status