Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Verify that deploy token has valid access when pulling container registry image | Mayra Cabrera | 2018-04-10 | 1 | -10/+21 |
| | |||||
* | Allow group owner to enable runners from subgroups (#41981) | Dylan Griffith | 2018-04-09 | 1 | -0/+15 |
| | |||||
* | Handle limit for datetime attributes on MySQL | Mayra Cabrera | 2018-04-06 | 1 | -0/+38 |
| | | | | | | | | | | | The TIMESTAMP data type is used for values that contain both date and time parts. TIMESTAMP has a range of '1970-01-01 00:00:01' UTC to '2038-01-19 03:14:07' UTC. A Forever lib class was included to handle future dates for PostgreSQL and MySQL, also changes were made to DeployToken to enforce Forever.date Also removes extra conditional from JwtController | ||||
* | Addresses database comments | Mayra Cabrera | 2018-04-06 | 1 | -1/+0 |
| | | | | | | | - Adds a default on expires_at datetime - Modifies deploy tokens views to handle default expires at value - Use datetime_with_timezone where possible - Remove unused scopes | ||||
* | Increase test suite around deploy tokens behavior | Mayra Cabrera | 2018-04-06 | 1 | -1/+20 |
| | | | | Also, fixes broken specs | ||||
* | Include ProjectDeployTokens | Mayra Cabrera | 2018-04-06 | 3 | -15/+52 |
| | | | | | | Also: - Changes scopes from serializer to use boolean columns - Fixes broken specs | ||||
* | Addreses backend review suggestions | Mayra Cabrera | 2018-04-06 | 1 | -0/+1 |
| | | | | | | - Remove extra method for authorize_admin_project - Ensure project presence - Rename 'read_repo' to 'read_repository' to be more verbose | ||||
* | Implement 'read_repo' for DeployTokens | Mayra Cabrera | 2018-04-06 | 1 | -14/+32 |
| | | | | This will allow to download a repo using the token from the DeployToken | ||||
* | Create barebones for Deploytoken | Mayra Cabrera | 2018-04-06 | 1 | -0/+38 |
| | | | | | | | | | | Includes: - Model, factories, create service and controller actions - As usual, includes specs for everything - Builds UI (copy from PAT) - Add revoke action Closes #31591 | ||||
* | Merge branch 'fix/gb/fix-deployment-platform-for-environment' into 'master' | Kamil Trzciński | 2018-04-06 | 1 | -0/+26 |
|\ | | | | | | | | | Fix environment deployment platform filter method See merge request gitlab-org/gitlab-ce!18216 | ||||
| * | Fix environment deployment platform filter method | Grzegorz Bizon | 2018-04-06 | 1 | -0/+26 |
| | | |||||
* | | Merge branch 'ab-37462-cache-personal-projects-count' into 'master' | Yorick Peterse | 2018-04-06 | 1 | -4/+16 |
|\ \ | | | | | | | | | | | | | | | | | | | Cache personal projects count. Closes #37462 See merge request gitlab-org/gitlab-ce!18197 | ||||
| * | | Cache personal projects count. | Andreas Brandl | 2018-04-06 | 1 | -4/+16 |
| |/ | | | | | | | Closes #37462. | ||||
* | | [Rails5] Update `type_cast_*_database` methods | blackst0ne | 2018-04-06 | 1 | -3/+3 |
|/ | |||||
* | Merge branch 'bvl-override-import-params' into 'master' | Douwe Maan | 2018-04-05 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | Allow passing params to import API to override project attributes Closes gitlab-ee#4788 See merge request gitlab-org/gitlab-ce!18086 | ||||
| * | Don't export `Project#description_html` | Bob Van Landuyt | 2018-04-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | Since we can regenerate `description_html` from the `description`, we should not export it. This avoids some complexity when overriding the description during an import/export where we would need to invalidate this cached field. Now we refresh the markdown cache after the import | ||||
* | | Merge branch 'use-chronic-duration-attribute-for-project-build-timeout' into ↵ | Kamil Trzciński | 2018-04-05 | 1 | -10/+24 |
|\ \ | | | | | | | | | | | | | | | | | | | 'master' Use chronic duration attribute for project build timeout See merge request gitlab-org/gitlab-ce!17386 | ||||
| * | | Specify default value for Project#build_timeout | Tomasz Maczukin | 2018-04-04 | 1 | -10/+24 |
| |/ | |||||
* | | Merge branch 'dm-internal-user-namespace' into 'master' | Sean McGivern | 2018-04-05 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | Ensure internal users (ghost, support bot) get assigned a namespace See merge request gitlab-org/gitlab-ce!18194 | ||||
| * | | Ensure internal users (ghost, support bot) get assigned a namespacedm-internal-user-namespace | Douwe Maan | 2018-04-05 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2018-04-05 | 1 | -0/+16 |
|\ \ \ | |||||
| * \ \ | Merge branch 'bvl-export-import-lfs' into 'master' | Douwe Maan | 2018-04-05 | 1 | -0/+16 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export and import LFS objects Closes #40643 See merge request gitlab-org/gitlab-ce!18115 | ||||
| | * | | | Add helper for accessing lfs_objects for project | Bob Van Landuyt | 2018-04-05 | 1 | -0/+16 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes accessing LFS Objects for a project easier project.lfs_storage_project.lfs_objects` becomes project.all_lfs_objects This will make the refactor in https://gitlab.com/gitlab-org/gitlab-ce/issues/39769 easier to deal with. | ||||
* | | | | Merge branch 'jej/mattermost-notification-confidentiality-10-6' into ↵ | Douwe Maan | 2018-04-05 | 3 | -0/+46 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-10-6' [10.6] Prevent notes on confidential issues from being sent to chat See merge request gitlab/gitlabhq!2366 # Conflicts: # app/helpers/services_helper.rb | ||||
* | | | Create metadata object on build object creation | Tomasz Maczukin | 2018-04-04 | 1 | -1/+1 |
|/ / | |||||
* | | Revert "Allow CI/CD Jobs being grouped on version strings" | Zeger-Jan van de Weg | 2018-04-04 | 1 | -3/+1 |
|/ | | | | This reverts commit 4f2cdb51df0f2729055ec4dc6960ae347163da16. | ||||
* | Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' ↵ | Sean McGivern | 2018-04-04 | 1 | -5/+2 |
|\ | | | | | | | | | | | | | | | | | into 'master' Use shard name in Git::GitlabProjects instead of shard path Closes gitaly#1110 See merge request gitlab-org/gitlab-ce!18015 | ||||
| * | Use shard name in Git::GitlabProjects instead of shard path | Ahmad Sherif | 2018-04-03 | 1 | -5/+2 |
| | | | | | | | | Closes gitaly#1110 | ||||
* | | [Rails5] Rename `sort` methods to `sort_by_attribute` | blackst0ne | 2018-04-04 | 2 | -10/+10 |
| | | |||||
* | | Make error messages even more descriptive | Douwe Maan | 2018-04-02 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'feature/gb/variables-expressions-in-only-except' into 'master' | Kamil Trzciński | 2018-04-02 | 2 | -7/+122 |
|\ \ | | | | | | | | | | | | | | | | | | | Pipeline variables expression in only/except configuration Closes #37397 See merge request gitlab-org/gitlab-ce!17316 | ||||
| * | | Improve naming and optimize methods of the build class | Grzegorz Bizon | 2018-03-30 | 1 | -5/+5 |
| | | | |||||
| * | | Extract build variables that depend on persistence | Grzegorz Bizon | 2018-03-29 | 1 | -7/+8 |
| | | | |||||
| * | | Merge branch 'master' into 'feature/gb/variables-expressions-in-only-except' | Grzegorz Bizon | 2018-03-29 | 11 | -209/+471 |
| |\ \ | | | | | | | | | | | | | Conflicts: app/models/ci/build.rb | ||||
| * | | | Improve specs for predefined build variables | Grzegorz Bizon | 2018-03-27 | 1 | -6/+20 |
| | | | | |||||
| * | | | Add specs for method that exposes build variables hash | Grzegorz Bizon | 2018-03-27 | 1 | -0/+12 |
| | | | | |||||
| * | | | Decouple build variables from persisted environment | Grzegorz Bizon | 2018-03-27 | 1 | -4/+4 |
| | | | | |||||
| * | | | Merge branch 'master' into feature/gb/variables-expressions-in-only-except | Grzegorz Bizon | 2018-03-27 | 12 | -62/+297 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (199 commits) Conflicts: lib/gitlab/ci/pipeline/seed/stage.rb | ||||
| * | | | | Expose evaluable variables method from build object | Grzegorz Bizon | 2018-03-23 | 1 | -7/+28 |
| | | | | | |||||
| * | | | | Integrate build seeds with variables expressions policy | Grzegorz Bizon | 2018-03-23 | 1 | -0/+14 |
| | | | | | |||||
| * | | | | Make it possible to access static builds variables | Grzegorz Bizon | 2018-03-23 | 1 | -0/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to access static build variables even when an object is not persisted yet. This will allow us to evaluate build variables using only/except policies before deciding whether we actually want to persist the build in the database, or not. | ||||
* | | | | | Merge branch '44291-usage-ping-for-kubernetes-integration' into 'master' | Kamil Trzciński | 2018-04-02 | 5 | -0/+84 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Usage ping for Kubernetes integration" Closes #44291 See merge request gitlab-org/gitlab-ce!17922 | ||||
| * | | | | | Extract cluster installed query to scope | Matija Čupić | 2018-03-30 | 1 | -0/+12 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into 44291-usage-ping-for-kubernetes-integration | Matija Čupić | 2018-03-29 | 17 | -376/+851 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Add installed scope to cluster applications | Matija Čupić | 2018-03-29 | 4 | -0/+48 |
| | | | | | | |||||
| * | | | | | Add user_provided and gcp_provided cluster scopes | Matija Čupić | 2018-03-29 | 1 | -0/+24 |
| | | | | | | |||||
* | | | | | | Extend API for exporting a project with direct upload URL | Francisco Javier López | 2018-03-30 | 1 | -1/+18 |
| | | | | | | |||||
* | | | | | | Add port number to artifacts links to gitlab-pages, if needed | Alessio Caiazza | 2018-03-29 | 2 | -0/+41 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'add-per-runner-job-timeout' into 'master' | Kamil Trzciński | 2018-03-29 | 3 | -6/+240 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add per runner job timeout Closes #43426 See merge request gitlab-org/gitlab-ce!17221 | ||||
| * | | | | | Remove Ci::Build#timeout | Tomasz Maczukin | 2018-03-28 | 1 | -37/+0 |
| | | | | | |