summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'backport-ce-to-ee-merge' into 'master'Stan Hu2018-10-061-1/+1
|\ | | | | | | | | Backport of CE upstream - 2018-10-05 12:21 UTC See merge request gitlab-org/gitlab-ce!22154
| * Fix CE to EE merge (backport)Kamil Trzciński2018-10-051-1/+1
| |
* | Add timed incremental rollout to Auto DevOpsAlessio Caiazza2018-10-051-31/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | Auto DevOps deployment strategies now supports timed incremental rollout. We are deprecating the usage of INCREMENTAL_ROLLOUT_ENABLED environment variable in Auto DevOps template. The new behavior will be driven by the INCREMENTAL_ROLLOUT_MODE variable that can either be manual (same as INCREMENTAL_ROLLOUT_ENABLED) or timed. Rollout deployments will be executed using a 5 minute delay between each job.
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqBob Van Landuyt2018-10-054-5/+18
|\ \
| * \ Merge branch 'security-bw-confidential-titles-through-markdown-api' into ↵Bob Van Landuyt2018-10-052-4/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [master] Confidential issue/private snippet titles can be read by unauthenticated user through GFM markdown API Closes #2706 See merge request gitlab/gitlabhq!2507
| | * | post_process markdown redered by APIBrett Walker2018-09-292-4/+10
| | | |
| * | | Merge branch 'security-fix-leaking-private-project-namespace' into 'master'Bob Van Landuyt2018-10-052-1/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Fix leaking private project namespace Closes #2708 See merge request gitlab/gitlabhq!2529
| | * | | Filter system notes with public and private cross referencesBrett Walker2018-10-022-1/+8
| | | | |
* | | | | Merge branch ↵Sean McGivern2018-10-051-9/+75
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '50359-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' Resolve "ActiveRecord::StatementInvalid: PG::QueryCanceled: ERROR: canceling statement due to statement timeout" Closes #50359 See merge request gitlab-org/gitlab-ce!21893
| * | | | | Use a CTE to remove the query timeoutBrett Walker2018-10-051-9/+75
| | | | | |
* | | | | | Merge branch 'ce-5987-project-templates-api' into 'master'Robert Speicher2018-10-055-7/+74
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Add a new project-specific templates API endpoint See merge request gitlab-org/gitlab-ce!22118
| * | | | | Backport project template API to CENick Thomas2018-10-055-7/+74
| | | | | |
* | | | | | Merge branch 'scheduled-manual-jobs' into 'master'Kamil Trzciński2018-10-0512-7/+157
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delayed jobs Closes #51352 See merge request gitlab-org/gitlab-ce!21767
| * \ \ \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0510-13/+102
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-057-7/+16
| |\ \ \ \ \ \ \
| * | | | | | | | Add limitation for start_in keywordShinya Maeda2018-10-043-1/+16
| | | | | | | | |
| * | | | | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0413-135/+108
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-034-1/+95
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rename failure reason to stale_scheduleShinya Maeda2018-10-021-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Add scheduled statusShinya Maeda2018-10-023-1/+23
| | | | | | | | | | |
| * | | | | | | | | | Add unschedule action to status buildShinya Maeda2018-10-022-0/+42
| | | | | | | | | | |
| * | | | | | | | | | Fix coding style offenceShinya Maeda2018-10-021-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Use correct icon for scheduled jobs in pipeline graphWinnie Hellmann2018-10-021-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Allow remaining time of scheduled jobs to overflow one dayWinnie Hellmann2018-10-021-2/+4
| | | | | | | | | | |
| * | | | | | | | | | Fix URL to empty state graphic of scheduled jobsWinnie Hellmann2018-10-021-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix Status::Build::Scheduled. Add spec for the class.Shinya Maeda2018-10-021-1/+4
| | | | | | | | | | |
| * | | | | | | | | | Fix validation methods in Config::Entry::Job. Added spec for thatShinya Maeda2018-10-021-9/+4
| | | | | | | | | | |
| * | | | | | | | | | Add schedule_expired to failed statusShinya Maeda2018-10-021-1/+2
| | | | | | | | | | |
| * | | | | | | | | | Remove Scheduled Status class from pipelineShinya Maeda2018-10-023-23/+1
| | | | | | | | | | |
| * | | | | | | | | | Check the precense of scheduled_at in Status::BuildShinya Maeda2018-10-021-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix stuck job worker. Fix sidekiq queue namespaceShinya Maeda2018-10-021-1/+2
| | | | | | | | | | |
| * | | | | | | | | | Introduce enqueue_scheduled eventShinya Maeda2018-10-021-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix spec. Create scheduled status entry for pipelineShinya Maeda2018-10-022-0/+22
| | | | | | | | | | |
| * | | | | | | | | | Fix rubocop offenceShinya Maeda2018-10-021-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Update pipelines and stages status as wellShinya Maeda2018-10-022-23/+24
| | | | | | | | | | |
| * | | | | | | | | | Add a new status to ci_builds.statusShinya Maeda2018-10-023-6/+10
| | | | | | | | | | |
| * | | | | | | | | | Rename delayed to scheduledShinya Maeda2018-10-023-12/+14
| | | | | | | | | | |
| * | | | | | | | | | Support new syntaxShinya Maeda2018-10-024-10/+10
| | | | | | | | | | |
| * | | | | | | | | | Squashed commit of the following:Shinya Maeda2018-10-024-3/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 9d9594ba20097dc4598f7eb42a9f9d78d73eae54 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Sep 13 20:18:31 2018 +0900 Cancel scheduled jobs commit f31c7172e07a9eb03b58c1e62eaa18cda4064aa6 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Sep 13 11:18:42 2018 +0900 Add Ci::BuildSchedule commit fb6b3ca638f40f9e1ee38b1fdd892bda4f6fede7 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Sep 12 20:02:50 2018 +0900 Scheduled jobs
* | | | | | | | | | | Merge branch 'add-installation-type-backup-information' into 'master'Douwe Maan2018-10-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add installation type to backup information file See merge request gitlab-org/gitlab-ce!22150
| * | | | | | | | | | Add installation type to backup information fileBalasankar "Balu" C2018-10-051-0/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch ↵Sean McGivern2018-10-051-1/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '5699-enabling-disabling-features-does-not-propagate-correctly-to-geo-secondaries' into 'master' Backport a refactor on the Feature.flipper method to CE See merge request gitlab-org/gitlab-ce!22152
| * | | | | | | | | | Refactor Feature.flipper methodDouglas Barbosa Alexandre2018-10-051-1/+5
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'load_project_features' into 'master'Sean McGivern2018-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preload project features in reference parser Closes #43094 See merge request gitlab-org/gitlab-ce!22008
| * | | | | | | | | Preload project features in reference parserJan Provaznik2018-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preloading of project_features mitigates N+1 queries when checking references in other projects. When loading projects for resources referenced in comments it makes sense to include also associated project_features because in the following step (`can_read_reference?(user, projects[node], node)`) project features is used for checking permissions for the given project.
* | | | | | | | | | Make GitLab pages support access controlTuomo Ala-Vannesluoma2018-10-051-0/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'feature/gb/pipeline-only-except-with-modified-paths' into 'master'Kamil Trzciński2018-10-054-2/+89
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-052-1/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'feature/gb/pipeline-only-except-with-modified-paths'feature/gb/pipeline-only-except-with-modified-pathsKamil Trzciński2018-10-04133-208/+734
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/ci/pipeline.rb
| * | | | | | | | | | Add frozen strong literal directive to policy changes classGrzegorz Bizon2018-10-021-0/+2
| | | | | | | | | | |
View Lorry Controller Status