Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add latest changes from gitlab-org/gitlab@13-0-stable-ee | GitLab Bot | 2020-05-20 | 3 | -3/+3 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-25 | 1 | -29/+5 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-23 | 1 | -1/+5 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-21 | 1 | -1/+2 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-18 | 3 | -3/+3 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-17 | 1 | -0/+63 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-17 | 3 | -87/+148 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-12 | 1 | -0/+19 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-02-29 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-01-29 | 1 | -6/+6 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-01-21 | 1 | -2/+2 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-12-10 | 1 | -8/+39 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-11-07 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-10-11 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-10-02 | 1 | -2/+2 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-17 | 1 | -2/+7 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-16 | 1 | -101/+0 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-13 | 1 | -0/+101 |
| | |||||
* | Replace rails_helper.rb with spec_helper.rb66741-remove-spec-rails_helper-rb | Ash McKenzie | 2019-08-30 | 1 | -1/+1 |
| | | | | | rails_helper.rb's only logic was to require spec_helper.rb. | ||||
* | Ensure changelog filenames are less than 99 characters longfix-filename-length | Balasankar "Balu" C | 2019-08-13 | 1 | -1/+1 |
| | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com> | ||||
* | Make `bin/web_puma` consider RAILS_ENVfix-bin-web-puma-script-to-consider-rails-env | Aleksei Lipniagov | 2019-08-01 | 1 | -1/+1 |
| | |||||
* | Fix secpick pushing to stable branchfix-secpick | Thong Kuah | 2019-07-30 | 1 | -1/+1 |
| | |||||
* | Upgrade to Rails 5.2upgrade-rails-5-2-ce | Heinrich Lee Yu | 2019-07-12 | 4 | -17/+33 |
| | | | | Updates changed method names and fixes spec failures | ||||
* | Enable puma by default in GDK490-enable-puma-by-default-in-GDK | Qingyu Zhao | 2019-07-09 | 2 | -55/+71 |
| | | | | | | | | | | | | | | | | 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 | ||||
* | bin/background_jobs: use pgroups | Nick Thomas | 2019-02-28 | 1 | -1/+8 |
| | |||||
* | Merge branch 'ac-secpick-template' into 'master' | Robert Speicher | 2019-02-14 | 1 | -2/+2 |
|\ | | | | | | | | | Select Security Release template with secpick See merge request gitlab-org/gitlab-ce!25246 | ||||
| * | Select Security Release template with secpick | Alessio Caiazza | 2019-02-14 | 1 | -2/+2 |
| | | |||||
* | | Simplify bin/secpick git commands | Pavel Shutsin | 2019-02-14 | 1 | -3/+1 |
|/ | |||||
* | Fix incorrect stable branch name for templatesfix-stable-branch-prefix | Yorick Peterse | 2019-02-06 | 1 | -2/+2 |
| | | | | | | 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`. | ||||
* | Remove requirement to target security branches | Yorick Peterse | 2019-02-06 | 1 | -8/+8 |
| | | | | | | | | | | 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. | ||||
* | Create security release MR template | Marin Jankovski | 2019-01-28 | 1 | -2/+2 |
| | | | | Improve existing issue templates for security releases | ||||
* | Opens specified text editor when creating a new changelog entry | Tiago Botelho | 2019-01-14 | 1 | -1/+9 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Fix Rubocop offenses in bin/secpick scriptbackstage/gb/improve-secpick-script | Grzegorz Bizon | 2019-01-07 | 1 | -100/+105 |
| | |||||
* | Show a valid new merge request URL in EE case | Grzegorz Bizon | 2019-01-07 | 1 | -3/+11 |
| | |||||
* | Improve `bin/secpick` script and add more options | Grzegorz Bizon | 2019-01-03 | 1 | -29/+80 |
| | | | | | | | | | 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. | ||||
* | Update secpick script | James Lopez | 2018-12-18 | 1 | -1/+22 |
| | |||||
* | Remove rails 4 support in CI, Gemfiles, bin/ and config/ | Jasper Maes | 2018-12-14 | 4 | -60/+7 |
| | |||||
* | Make rails5 defailt in bin/* scripts | Jan Provaznik | 2018-11-14 | 3 | -3/+3 |
| | |||||
* | Switch to Rails 5 by default | Jan Provaznik | 2018-11-14 | 1 | -1/+1 |
| | | | | | * updates Gemfile * uses Rails 5 unless explicitly disabled | ||||
* | Merge branch 'an-multithreading' into 'master' | Robert Speicher | 2018-10-25 | 2 | -0/+68 |
|\ | | | | | | | | | | | | | Puma in GDK and rack server lifecycle event abstractions Closes #52762 See merge request gitlab-org/gitlab-ce!22372 | ||||
| * | Add experimental support for Pumaan-multithreading | Andrew Newdigate | 2018-10-25 | 2 | -0/+68 |
| | | | | | | | | | | | | 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. | ||||
* | | Fix secpick to use EE and guess branch name | James Lopez | 2018-10-24 | 1 | -4/+10 |
|/ | |||||
* | Make getting a user by the username case insensitive | William George | 2018-10-18 | 1 | -1/+1 |
| | |||||
* | Remove Git circuit breaker | Zeger-Jan van de Weg | 2018-10-10 | 1 | -11/+0 |
| | | | | | | | 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. | ||||
* | Correct Gitlab Capitalization in code files | Marcel Amirault | 2018-09-21 | 1 | -1/+1 |
| | |||||
* | Fix grammar (setup to set-up) in code comments, spec, views, etc. | Marcel Amirault | 2018-09-17 | 1 | -1/+1 |
| | |||||
* | Fix `bin/secpick` rainbow gem error, and security branch prefixing | Michael Kozono | 2018-08-15 | 1 | -1/+3 |
| | |||||
* | Truncate filenames created by bin/changelog to 140 characters | Stan Hu | 2018-07-11 | 1 | -4/+10 |
| | |||||
* | Improve shelling out in bin/changelog | Jacob Vosmaer (GitLab) | 2018-06-25 | 1 | -14/+35 |
| | |||||
* | Merge branch 'blackst0ne-remove-spinach' into 'master' | Rémy Coutable | 2018-05-15 | 1 | -13/+0 |
|\ | | | | | | | | | | | | | Remove Spinach Closes #23036 See merge request gitlab-org/gitlab-ce!18869 |