Commit Graph

130 Commits

Author SHA1 Message Date
GitLab Bot d9ab72d608 Add latest changes from gitlab-org/gitlab@14-4-stable-ee 2021-10-20 08:43:02 +00:00
GitLab Bot 0653e08efd Add latest changes from gitlab-org/gitlab@14-3-stable-ee 2021-09-20 13:18:24 +00:00
GitLab Bot b76ae63846 Add latest changes from gitlab-org/gitlab@14-2-stable-ee 2021-08-19 09:08:42 +00:00
GitLab Bot e8d2c25793 Add latest changes from gitlab-org/gitlab@14-1-stable-ee 2021-07-20 09:55:51 +00:00
GitLab Bot a5f4bba440 Add latest changes from gitlab-org/gitlab@14-0-stable-ee 2021-06-16 18:25:58 +00:00
GitLab Bot 9dc93a4519 Add latest changes from gitlab-org/gitlab@13-11-stable-ee 2021-04-20 23:50:22 +00:00
GitLab Bot 5a1541a44f Add latest changes from gitlab-org/gitlab@13-9-stable-ee 2021-02-23 18:42:02 +00:00
GitLab Bot 859a6fb938 Add latest changes from gitlab-org/gitlab@13-9-stable-ee 2021-02-18 10:34:06 +00:00
GitLab Bot 7114ad8ea2 Add latest changes from gitlab-org/gitlab@13-8-stable-ee 2021-02-04 17:42:58 +00:00
GitLab Bot 7e9c479f7d Add latest changes from gitlab-org/gitlab@13-6-stable-ee 2020-11-19 08:27:35 +00:00
GitLab Bot 48aff82709 Add latest changes from gitlab-org/gitlab@13-5-stable-ee 2020-10-21 07:08:36 +00:00
GitLab Bot 85dc423f70 Add latest changes from gitlab-org/gitlab@13-4-stable-ee 2020-09-19 01:45:44 +00:00
GitLab Bot 6e4e1050d9 Add latest changes from gitlab-org/gitlab@13-3-stable-ee 2020-08-20 18:42:06 +00:00
GitLab Bot a09983ae35 Add latest changes from gitlab-org/gitlab@13-2-stable-ee 2020-07-20 12:26:25 +00:00
GitLab Bot 8c7f4e9d5f Add latest changes from gitlab-org/gitlab@13-1-stable-ee 2020-06-18 11:18:50 +00:00
GitLab Bot 9f46488805 Add latest changes from gitlab-org/gitlab@13-0-stable-ee 2020-05-20 14:34:42 +00:00
GitLab Bot e1549c7584 Add latest changes from gitlab-org/gitlab@master 2020-03-25 21:08:06 +00:00
GitLab Bot 8f9beefac3 Add latest changes from gitlab-org/gitlab@master 2020-03-23 12:09:47 +00:00
GitLab Bot 1ccf61bdcc Add latest changes from gitlab-org/gitlab@master 2020-03-21 00:09:18 +00:00
GitLab Bot 8b5c2a4525 Add latest changes from gitlab-org/gitlab@master 2020-03-18 21:09:22 +00:00
GitLab Bot 154b9bae14 Add latest changes from gitlab-org/gitlab@master 2020-03-17 21:09:16 +00:00
GitLab Bot 2c156e3c7b Add latest changes from gitlab-org/gitlab@master 2020-03-17 18:09:44 +00:00
GitLab Bot 5781a49660 Add latest changes from gitlab-org/gitlab@master 2020-03-12 00:09:34 +00:00
GitLab Bot e56fd47150 Add latest changes from gitlab-org/gitlab@master 2020-02-29 00:07:44 +00:00
GitLab Bot 6b9d3a4e83 Add latest changes from gitlab-org/gitlab@master 2020-01-29 18:08:47 +00:00
GitLab Bot 6755df108b Add latest changes from gitlab-org/gitlab@master 2020-01-21 00:08:46 +00:00
GitLab Bot 97d4d92663 Add latest changes from gitlab-org/gitlab@master 2019-12-10 09:07:51 +00:00
GitLab Bot bf3d94a733 Add latest changes from gitlab-org/gitlab@master 2019-11-07 09:06:03 +00:00
GitLab Bot 0dea53d5e5 Add latest changes from gitlab-org/gitlab@master 2019-10-11 09:06:43 +00:00
GitLab Bot 587794b4b8 Add latest changes from gitlab-org/gitlab@master 2019-10-02 00:06:26 +00:00
GitLab Bot 4ab54c2233 Add latest changes from gitlab-org/gitlab@master 2019-09-17 14:16:34 +00:00
GitLab Bot d2798d607e Add latest changes from gitlab-org/gitlab@master 2019-09-16 12:06:26 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Ash McKenzie 19ff9d9899
Replace rails_helper.rb with spec_helper.rb
rails_helper.rb's only logic was to require
spec_helper.rb.
2019-08-30 12:26:18 +10:00
Balasankar "Balu" C 9ab5346eeb
Ensure changelog filenames are less than 99 characters long
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2019-08-13 14:28:54 +05:30
Aleksei Lipniagov e2e878bdd8 Make `bin/web_puma` consider RAILS_ENV 2019-08-01 17:47:52 +03:00
Thong Kuah 96f8a282c6 Fix secpick pushing to stable branch 2019-07-30 10:51:29 +00:00
Heinrich Lee Yu aeb67dd489 Upgrade to Rails 5.2
Updates changed method names and fixes spec failures
2019-07-12 10:15:31 +08:00
Qingyu Zhao b7ea4bd853 Enable puma by default in GDK
Two changes:
1. Move bin/web to bin/web_unicorn(removed PUMA switching logic)
Introduce new shadow script bin/web. Now we have 3 scripts working
together: bin/web, bin/web_puma, bin/web_unicorn

  In bin/web, it checks ENV['USE_WEB_SERVER']:
    - if value is 'puma' or value is not set, call bin/web_puma
    - if value is 'unicorn', call bin/web_unicorn
    - report error if other values given

2. Gitlab rails allow ENV setting to override timeout
    - ENV['GITLAB_RAILS_RACK_TIMEOUT'] for service_timeout
    - ENV['GITLAB_RAILS_WAIT_TIMEOUT'] for wait_timeout
2019-07-09 23:31:32 +10:00
Nick Thomas 9e783be668
bin/background_jobs: use pgroups 2019-02-28 21:58:31 +00:00
Robert Speicher 701303a5db Merge branch 'ac-secpick-template' into 'master'
Select Security Release template with secpick

See merge request gitlab-org/gitlab-ce!25246
2019-02-14 19:15:49 +00:00
Alessio Caiazza 3f100ee9ce Select Security Release template with secpick 2019-02-14 15:11:51 +01:00
Pavel Shutsin bba8dc7d67 Simplify bin/secpick git commands 2019-02-14 09:24:30 +00:00
Yorick Peterse 67ca0be004
Fix incorrect stable branch name for templates
In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24962 the
stable branches were incorrectly changed to `stable-X-Y`. This commit
fixes this so we correctly use `X-Y-stable`.
2019-02-06 16:32:10 +01:00
Yorick Peterse 0d05c58116
Remove requirement to target security branches
This removes the requirement and any mention of targeting security
branches when working on security releases. The release process
documentation changes for these CE changes can be found in merge request
https://gitlab.com/gitlab-org/release/docs/merge_requests/97.

The proposal to remove security branches was approved in
https://gitlab.com/gitlab-org/release/framework/issues/165#note_138139016.
2019-02-06 14:14:55 +01:00
Marin Jankovski e4db1a615b
Create security release MR template
Improve existing issue templates for security releases
2019-01-28 12:51:37 +01:00
Tiago Botelho 83106427c8
Opens specified text editor when creating a new changelog entry
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-14 18:11:05 +01:00
Grzegorz Bizon 1a2b9e3190 Fix Rubocop offenses in bin/secpick script 2019-01-07 13:38:31 +01:00
Grzegorz Bizon ab714baf0e Show a valid new merge request URL in EE case 2019-01-07 13:38:23 +01:00
Grzegorz Bizon fde4eb7331 Improve `bin/secpick` script and add more options
This adds additional options that make it easier to use this script:

1. It adds `--dry-run` option that only displays Git commands that are
going to be executed.
2. It adds `--remote` option that makes it possible to override Git
remote name.
2019-01-03 13:15:05 +01:00