- 14 Sep, 2016 5 commits
-
-
Job van der Voort authored
Document the fact that merge requests from forks can be checked out locally As pointed out by @JobV, our documentation doesn't clearly state that you can checkout a merge request from a fork locally. See merge request !6324
-
Rémy Coutable authored
Update GITLAB_SHELL_VERSION to 3.5.0 to include the 2FA recovery commands. See merge request !6227
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Drew Blessing authored
-
Stan Hu authored
Fix Gitlab::Popen.popen thread-safety issue ## What does this MR do? It changes the instance variables of `Gitlab::Popen.popen` to a local ones. ## Are there points in the code the reviewer needs to double check? N/A ## Why was this MR needed? It fixes a bug! ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [ ] ~~Added for this feature/bug~~ - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #21842 See merge request !6194
-
- 13 Sep, 2016 35 commits
-
-
Robert Speicher authored
Move pushes_since_gc to Redis ## What does this MR do? This moves tracking of the pushes since the last Git GC to Redis to reduce DB load. ## Are there points in the code the reviewer needs to double check? Styling mostly. ## Why was this MR needed? Updating this column can lead to a lot of writes which in turn puts a lot of load on table vacuuming. For example, in the last hour alone we had 5067 UPDATEs for this column (per InfluxDB): ``` > select count(increment_pushes_since_gc_call_count) from sidekiq_transactions where time > now() - 1h; name: sidekiq_transactions -------------------------- time count 1473780996567714622 5067 ``` ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/22125 See merge request !6326
-
Stan Hu authored
Allow trailing newline in secret base64 data Fixes https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1575 See merge request !6327
-
Yorick Peterse authored
This moves tracking of the pushes since the last Git GC from PostgreSQL to Redis. This reduces the number of writes on the "projects" table. This in turn reduces the vacuuming overhead. The lease used for incrementing the counter has been removed. This lease was mostly put in place to prevent high database load but this isn't needed anymore due to the counter now being stored in Redis. Fixes gitlab-org/gitlab-ce#22125
-
Robert Speicher authored
Use `haml_lint` for views linting ## What does this MR do? Add HAML-linting to the GitLab codebase. ## What are the relevant issue numbers? Closes #19984. See merge request !6307
-
Ahmad Sherif authored
Fixes #21842
-
Rémy Coutable authored
Change response for /ci/api/v1/builds/register.json from 404 to 204 ## What does this MR do? To check if there are new builds scheduled for a runner, runner is sending `POST /ci/api/v1/builds/register.json` requests. If there is a build then a `200` response with build data is returned. However if there is no builds scheduled for this runner it receives a `404 Not Found` response. This may end with a lot of `404 Not Found` lines in logs that are an expected behavior (please read #14445 for a reference). Since `v1.0.1` version GitLab Runner is ready to receive a `204 No Content` response in case of no builds. This MR adds a support for this status code for each Runner's version that can be determined while handling `POST /ci/api/v1/builds/register.json` request. ## Are there points in the code the reviewer needs to double check? Specs in `spec/requests/ci/api/builds_spec.rb` ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [ ] ~~Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)~~ - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #14445 See merge request !6225
-
Jacob Vosmaer authored
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Robert Speicher authored
Restore SSH Key title auto-population behavior Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21823 See merge request !6186
-
Robert Speicher authored
Update gitlab shell secret file also when it is empty Use `File.size?` instead of `File.exist?` so that secret token is generated when the file is empty. See merge request !3774
-
Robert Speicher authored
Import GitHub release notes ## Why was this MR needed? Release notes aren't currently migrated over when importing from GitHub ## What are the relevant issue numbers? #20780 See merge request !5981
-
Tomasz Maczukin authored
-
Robert Speicher authored
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21823
-
Tomasz Maczukin authored
-
Tomasz Maczukin authored
-
Tomasz Maczukin authored
[ci skip]
-
Tomasz Maczukin authored
[ci skip]
-
Tomasz Maczukin authored
-
Rémy Coutable authored
-
Rémy Coutable authored
Merge branch '21636-deleting-source-project-with-existing-fork-closes-all-related-merge-requests' into 'master' Deleting source project with existing fork link should closes all related merge requests, and does not render `invalid` template for merge requests with deleted source project. The merge request without source project can be edited but can't be reopened. Closes #21636 See merge request !6177
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
-
Yorick Peterse authored
Gitlab::Checks is now instrumented See merge request !6318
-
Yorick Peterse authored
Avoid protected branches checks when verifying access without branch name See merge request !6317
-
Annabel Dunstone Gray authored
Removed horizontal overflow from collapsed issuable sidebar ## What does this MR do? Uses flexbox to remove any horizontal overflow from the collapsed issuable sidebar ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? There was a horizontal scrollbar at the bottom of all collapsed issuable sidebars as seen in the screenshot in #21895. ## Screenshots (if relevant) ![2016-09-11_16.28.30](/uploads/8e01565385b1ff0b736630ac3c24a3a1/2016-09-11_16.28.30.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21895. See merge request !6295
-
Annabel Dunstone Gray authored
Fixed issue merge-request-info missing on mobile ## What does this MR do? Removed media query declaration relating to `.merge-request-info` and `.issue-info`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Mobile UX ## Screenshots (if relevant) ![Screen_Shot_2016-09-07_at_19.10.39](/uploads/6dc39b72459087826071ba9fbd06da17/Screen_Shot_2016-09-07_at_19.10.39.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21877 See merge request !6250
-