Commit Graph

90 Commits

Author SHA1 Message Date
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
James Lopez 9ba303bfed
Update secpick script 2018-12-18 10:21:29 +01:00
Jasper Maes 44fef4fe4c Remove rails 4 support in CI, Gemfiles, bin/ and config/ 2018-12-14 19:36:22 +01:00
Jan Provaznik 48b59620c1 Make rails5 defailt in bin/* scripts 2018-11-14 12:41:16 +01:00
Jan Provaznik 547dc7ac60 Switch to Rails 5 by default
* updates Gemfile
* uses Rails 5 unless explicitly disabled
2018-11-14 12:38:30 +01:00
Robert Speicher 679c0048a8 Merge branch 'an-multithreading' into 'master'
Puma in GDK and rack server lifecycle event abstractions

Closes #52762

See merge request gitlab-org/gitlab-ce!22372
2018-10-25 22:29:00 +00:00
Andrew Newdigate 1065f8ce7a Add experimental support for Puma
This allows us (and others) to test drive Puma without it affecting all
users. Puma can be enabled by setting the environment variable
"EXPERIMENTAL_PUMA" to a non empty value.
2018-10-25 17:50:15 +01:00
James Lopez 4585df83b9 Fix secpick to use EE and guess branch name 2018-10-24 17:20:03 +00:00
William George 1b153d497b Make getting a user by the username case insensitive 2018-10-18 09:06:44 +00:00
Zeger-Jan van de Weg 30b4ce940d
Remove Git circuit breaker
Was introduced in the time that GitLab still used NFS, which is not
required anymore in most cases. By removing this, the API it calls will
return empty responses. This interface has to be removed in the next
major release, expected to be 12.0.
2018-10-10 09:08:18 +02:00
Marcel Amirault eb640eded7 Correct Gitlab Capitalization in code files 2018-09-21 12:05:37 +00:00
Marcel Amirault 6876c7afa8 Fix grammar (setup to set-up) in code comments, spec, views, etc. 2018-09-17 09:17:33 +00:00
Michael Kozono 2e8fe26b9b Fix `bin/secpick` rainbow gem error, and security branch prefixing 2018-08-15 07:27:59 +00:00
Stan Hu df54458a93 Truncate filenames created by bin/changelog to 140 characters 2018-07-11 10:15:22 -07:00
Jacob Vosmaer (GitLab) dcdcbfa40b Improve shelling out in bin/changelog 2018-06-25 21:32:00 +00:00
Rémy Coutable a78b1b27b8 Merge branch 'blackst0ne-remove-spinach' into 'master'
Remove Spinach

Closes #23036

See merge request gitlab-org/gitlab-ce!18869
2018-05-15 09:43:55 +00:00
James Lopez 02e7962ad4 Update secpick 2018-05-14 07:57:53 +00:00
James Lopez a758352bb1 Update secpick 2018-05-14 07:55:25 +00:00
blackst0ne d2b8dc7d5c Remove bin/spinach 2018-05-14 18:53:57 +11:00
James Lopez f3ddb9f462 Update secpick to use security branches 2018-05-14 07:46:04 +00:00
James Lopez 22e198dae1 add initial dev task template for working on a security issue 2018-04-17 16:50:16 +00:00
blackst0ne 1a455f3d5c [Rails5] Fix running spinach tests
1. Add support for `RAILS5=1|true` for the `bin/spinach` command.
2. Synchronize used spinach versions both for rails4 and rails5.

For rails5 it was accidently used spinach 0.10.1 instead of 0.8.10.
That brought some problems on running spinach tests.

Example of failure message:

NoMethodError: undefined method `line' for #<Spinach::Scenario:0x000000000c86ba80>
Did you mean?  lines
  /builds/gitlab-org/gitlab-ce/features/support/env.rb:52:in `before_scenario_run'
2018-04-10 22:18:37 +11:00
blackst0ne 126b7c0f73 [Rails5] Allow using `RAILS5` env with rspec 2018-04-03 10:01:34 +11:00
blackst0ne 36bedfb7f3 [Rails5] Update files by `rails app:update` 2018-03-22 09:37:57 +11:00
Rémy Coutable 91f03a7ab2 Generate EE changelog under ee/changelogs/unreleased/
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-20 16:12:48 +01:00
Lin Jen-Shin e7115a3e9c Remove bin/upgrade.rb as we don't seem to refer it 2018-01-26 19:42:48 +08:00
Lin Jen-Shin 99784d7797 We need Rails in order to use Gitlab.config anyway 2018-01-26 19:42:48 +08:00
Sean McGivern 45d6a2b398 Add bin/profile-url tool and docs 2018-01-19 14:59:05 +00:00
Bob Van Landuyt f1ae1e39ce Move the circuitbreaker check out in a separate process
Moving the check out of the general requests, makes sure we don't have
any slowdown in the regular requests.

To keep the process performing this checks small, the check is still
performed inside a unicorn. But that is called from a process running
on the same server.

Because the checks are now done outside normal request, we can have a
simpler failure strategy:

The check is now performed in the background every
`circuitbreaker_check_interval`. Failures are logged in redis. The
failures are reset when the check succeeds. Per check we will try
`circuitbreaker_access_retries` times within
`circuitbreaker_storage_timeout` seconds.

When the number of failures exceeds
`circuitbreaker_failure_count_threshold`, we will block access to the
storage.

After `failure_reset_time` of no checks, we will clear the stored
failures. This could happen when the process that performs the checks
is not running.
2017-12-08 09:11:39 +01:00
Zeger-Jan van de Weg 2622a6de59
Add Performance category to the changelog
Resolves gitlab-org/gitlab-ce#36417
2017-10-13 12:45:56 +02:00
Robert Speicher 65ad11b46b Merge branch '21949-add-type-to-changelog' into 'master'
Let's start labeling our CHANGELOG entries

Closes #21949

See merge request !11579
2017-08-10 21:56:57 +00:00
Rémy Coutable 0a3f4dfc82
Don't require stackprof in Gemfile
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-09 10:10:33 +02:00
Jacopo eb2b895a20 Let's start labeling our CHANGELOG entries
Added the type attribute to a CHANGELOG entry. When you create a new
entry the software asks for the category of the change and sets the
associated type in the file.
2017-07-22 11:19:56 +02:00
Takuya Noguchi 158fc8150e Remove bin/ci/upgrade.rb as not working all 2017-06-24 00:19:04 +09:00
Jacob Vosmaer 275b7797c1 Add gitaly source installation instructions 2017-03-21 14:55:41 +01:00
Mike Greiling 0e4aaa06d3 remove remaining vestiges of teaspoon test runner 2017-01-10 12:30:41 -06:00
Adam Niedzielski 1c489296fd Remove trailing whitespace when generating changelog entry 2016-12-09 12:25:29 +01:00
Robert Speicher 614fcfc4df Simplify `branch_name` in bin/changelog
The `--short` option has existed since at least 1.8.1:
https://git-scm.com/docs/git-symbolic-ref/1.8.1
2016-12-02 18:31:57 +08:00
Nick Thomas 5e05f9c5c2 Add StackProf to the Gemfile, along with a utility to get a profile for a spec 2016-11-29 14:14:34 +00:00
Robert Speicher 2f3e710150 Update help banner for bin/changelog
[ci skip]
2016-11-03 12:55:32 +00:00
Robert Speicher 895673733a Add a `--force` option to bin/changelog 2016-11-02 22:15:20 +00:00