summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'feature/gb/pipeline-only-except-with-modified-paths' into 'master'Kamil Trzciński2018-10-0515-44/+556
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipeline only/except for modified paths See merge request gitlab-org/gitlab-ce!21981
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into feature/gb/pipeline-only-except-with-modified-pathsGrzegorz Bizon2018-10-0528-30/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Require spec helpers loaded by other spec helpers first Resolve "2FA mobile options should be rephrased" Add css class to Admin > Project > show page Trim whitespace when inviting a new user by email Bump Gitaly to v0.124.0 Banzai project ref- share context more aggresively Add reliable fetcher for Sidekiq Allows to filter issues by `Any milestone` in the API
| * | | | | | | | | | | | | | | | | | | | | | | | | Improve only: changes feature documentationGrzegorz Bizon2018-10-051-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align with current technical writing style-guides.
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into 'feature/gb/pipeline-only-except-with-modified-paths'feature/gb/pipeline-only-except-with-modified-pathsKamil Trzciński2018-10-04767-11907/+48338
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/ci/pipeline.rb
| * | | | | | | | | | | | | | | | | | | | | | | | | | Copy-edit documentation for only/except changes featureGrzegorz Bizon2018-10-041-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Few minor fixed in code and docs for only: changesGrzegorz Bizon2018-10-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Copy-edit docs for only: changes featureGrzegorz Bizon2018-10-021-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add basic documentation for only: changes featureGrzegorz Bizon2018-10-021-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog entry for only: changes featureGrzegorz Bizon2018-10-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add frozen strong literal directive to policy changes classGrzegorz Bizon2018-10-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Freeze mutable constant in CI entry policy classGrzegorz Bizon2018-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitaly integration tests for only: changes featureGrzegorz Bizon2018-10-022-46/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Match a dot in paths configured for only: changesGrzegorz Bizon2018-10-022-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add only/except pipeline build policy for `changes`Grzegorz Bizon2018-10-022-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to specifiy only: changes keywordsGrzegorz Bizon2018-10-022-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Expose paths modified by a push from a pipeline classGrzegorz Bizon2018-10-022-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Treat nil git push revisons as a blank Git SHA valueGrzegorz Bizon2018-10-022-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Improve specs for git push classGrzegorz Bizon2018-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps to prevent problems with off-by-one commmit problem in `Gitlab::Git::Push#modified_paths`.
| * | | | | | | | | | | | | | | | | | | | | | | | | | Calculate modified paths of a git push operationGrzegorz Bizon2018-09-284-3/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add specs for extracted git push classGrzegorz Bizon2018-09-282-2/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Extract git push from merge request refresh serviceGrzegorz Bizon2018-09-282-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add a class that represents a git push operationGrzegorz Bizon2018-09-282-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '22188-drop-down-filter-for-project-snippets' into 'master'Fatih Acet2018-10-0513-8/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Drop down filter for project snippets" Closes #22188 See merge request gitlab-org/gitlab-ce!21458
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Drop down filter for project snippets"Fabian Schneider2018-10-0513-8/+72
|/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ce-issue_1984' into 'master'Sean McGivern2018-10-052-67/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport CE changes from draft_notes addition in EE See merge request gitlab-org/gitlab-ce!22125
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Backport CE changes from draft_notes addition in EEMario de la Ossa2018-10-042-67/+82
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '50904-remove-icon-env' into 'master'Grzegorz Bizon2018-10-053-11/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes icon key from job endpoint See merge request gitlab-org/gitlab-ce!22085
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Delete 50904-remove-icon-env.ymlGrzegorz Bizon2018-10-051-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Removes icon key from job endpointFilipa Lacerda2018-10-044-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added because we thought we'd need to render the environment status but we already have this information in the build status
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'epics-e2e-tests' into 'master'Grzegorz Bizon2018-10-058-9/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding qa-selectors for e2e tests See merge request gitlab-org/gitlab-ce!21824
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding qa-selectors for e2e testsRamya Authappan2018-10-058-9/+58
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-29' into 'master'Marcia Ramos2018-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: Use proper Configure label instead of Configuration in issue_workflow.md See merge request gitlab-org/gitlab-ce!22114
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Use proper Configure label instead of Configuration in issue_workflow.mdZsolt Kovari2018-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '52143-use-tiller-directly' into 'master'Dmitriy Zaporozhets2018-10-051-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use tiller directly for Auto DevOps Closes #52143 See merge request gitlab-org/gitlab-ce!22076
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect IO streams to prevent hangingThong Kuah2018-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://en.wikipedia.org/wiki/Nohup#Overcoming_hanging https://gitlab.com/gitlab-org/gitlab-runner/issues/2880
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Use tiller directly for Auto DevOpsThong Kuah2018-10-051-5/+2
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves a external network call to fetch a helm plugin. The cost is a few lines of shell script
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'revert-2f0a0761' into 'master'Douwe Maan2018-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'feature/git-v2-flag' into 'master'" See merge request gitlab-org/gitlab-ce!22134
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'feature/git-v2-flag' into 'master'"James Lopez2018-10-051-1/+1
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !21520
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'features/unauth-access-ssh-keys' into 'master'Douwe Maan2018-10-054-29/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | List public ssh keys by id or username without authentication See merge request gitlab-org/gitlab-ce!20118
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | List public ssh keys by id or username without authenticationRonald Claveau2018-10-034-29/+22
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs-feature-enabled-and-licensed' into 'master'Douwe Maan2018-10-052-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `Feature.enabled_and_licensed?` See merge request gitlab-org/gitlab-ce!21687
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add ProjectFeature check for feature flagRobert Speicher2018-10-042-0/+19
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow an explicitly-disabled feature flag to override a feature being available for a project. As an extreme example, we could quickly disable issues across all projects at runtime by running `Feature.disable(:issues)`.
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '51748-filter-any-milestone-via-api' into 'master'Douwe Maan2018-10-056-1/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to filter issues by `Any milestone` in the API Closes #51748 See merge request gitlab-org/gitlab-ce!22080
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to filter issues by `Any milestone` in the APIJacopo2018-10-036-1/+31
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GET `api/v4/projects/:id/issues` the user can filter issues that have an assigned milestone through the parameter `milestone=Any+Milestone`.
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mao/48221-issues_show_sql_count' into 'master'Sean McGivern2018-10-057-10/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Banzai label ref finder - minimize SQL calls by sharing context more aggresively Closes #48221 See merge request gitlab-org/gitlab-ce!22070
| * | | | | | | | | | | | | | | | | | | | | | | | | | Banzai project ref- share context more aggresivelyMario de la Ossa2018-10-047-10/+34
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes `Banzai::CrossProjectReference#parent_from_ref` to return the project in the context if the project's `full_path` matches the ref we're looking for, as it makes no sense to go to the database to find a Project we already have loaded.
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'spec-helpers-order' into 'master'Stan Hu2018-10-051-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require spec helpers loaded by other spec helpers first See merge request gitlab-org/gitlab-ce!22127
| * | | | | | | | | | | | | | | | | | | | | | | | | Require spec helpers loaded by other spec helpers firstAlejandro Rodríguez2018-10-041-0/+5
|/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ee-7126-admin-projects-geo-status' into 'master'Douglas Barbosa Alexandre2018-10-041-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE backport: Add css class to Admin > Project > show page See merge request gitlab-org/gitlab-ce!22124
| * | | | | | | | | | | | | | | | | | | | | | | | | Add css class to Admin > Project > show pageGabriel Mazetto2018-10-041-0/+2
| | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |