summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Gitlab::Popen.popen thread-safety issuefix/gitlab-popen-thread-safetyAhmad Sherif2016-09-132-6/+7
| | | | Fixes #21842
* Merge branch 'feature/builds-register-change-404-to-204' into 'master' Rémy Coutable2016-09-137-20/+68
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix a typo in documentationfeature/builds-register-change-404-to-204Tomasz Maczukin2016-09-131-1/+1
| |
| * Add test with inactive error use case for 'POST /ci/api/v1/builds/register.json'Tomasz Maczukin2016-09-132-0/+14
| |
| * Fix rubocop offencesTomasz Maczukin2016-09-131-1/+1
| |
| * Update API documentationTomasz Maczukin2016-09-131-0/+9
| | | | | | | | [ci skip]
| * Update CHANGELOGTomasz Maczukin2016-09-131-0/+1
| | | | | | | | [ci skip]
| * Change response for /ci/api/v1/builds/register.json from 404 to 204Tomasz Maczukin2016-09-134-20/+44
| |
* | Merge branch 'rs-ssh-key-title-populate' into 'master' Robert Speicher2016-09-133-0/+20
|\ \ | | | | | | | | | | | | | | | | | | Restore SSH Key title auto-population behavior Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21823 See merge request !6186
| * | Restore SSH Key title auto-population behaviorRobert Speicher2016-09-133-0/+20
| |/ | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21823
* | Merge branch 'patch-4' into 'master' Robert Speicher2016-09-132-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | update gitlab shell secret file also when it is emptyElan Ruusamäe2016-09-132-1/+2
| | |
* | | Merge branch '20780-import-github-release-notes' into 'master' Robert Speicher2016-09-136-2/+120
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Import GitHub release notesAndrew Smith2016-09-136-2/+120
| |/ | | | | | | | | # Conflicts: # lib/gitlab/github_import/importer.rb
* | Merge branch ↵Rémy Coutable2016-09-138-21/+127
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | Change method name to #reopenable?Katarzyna Kobierska2016-09-133-12/+13
| | |
| * | Improve grammarKatarzyna Kobierska2016-09-132-2/+2
| | |
| * | Fix not working test with executeKatarzyna Kobierska2016-09-131-4/+4
| | |
| * | Add CHANGELOGKatarzyna Kobierska2016-09-131-0/+1
| | |
| * | Improve grammarKatarzyna Kobierska2016-09-132-2/+2
| | |
| * | Add #can_reopen? and testsKatarzyna Kobierska2016-09-134-24/+48
| | |
| * | Add methodKatarzyna Kobierska2016-09-132-0/+20
| | |
| * | Add test checking method closed_without_source_projectKatarzyna Kobierska2016-09-132-6/+38
| | |
| * | Add #closed_without_source_project?Katarzyna Kobierska2016-09-134-19/+26
| | |
| * | Checks if deleting forked project closed all open merge requestsKatarzyna Kobierska2016-09-133-6/+8
| | |
| * | Before deleting project if forked unlink forkKatarzyna Kobierska2016-09-132-0/+19
|/ /
* | Merge branch '22053-gitlab-checks-metrics' into 'master' Yorick Peterse2016-09-132-1/+3
|\ \ | | | | | | | | | | | | Gitlab::Checks is now instrumented See merge request !6318
| * | Gitlab::Checks is now instrumentedPaco Guzman2016-09-132-1/+3
| | | | | | | | | So we have a detailed view of what checks perform bad
* | | Merge branch 'avoid-loading-protected-branches-on-change-access-checks' into ↵Yorick Peterse2016-09-132-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Avoid protected branches checks when verifying access without branch name See merge request !6317
| * | | Avoid protected branches checks when verifying access without branch namePaco Guzman2016-09-132-0/+2
| |/ / | | | | | | | | | | | | | | | GitlabShell verify access sending ‘_any’ as the changes made on the git command, in those cases Gitlab::Checks::ChangeAccess won’t receive a branch_name so we don’t need to check for access to the protected branches on that repository. So we avoid some git operations in case the are not cached (empty_repo?) and some database lookups to get protected branches. These request is happening in every push.
* | | Merge branch '21895-horizontal-scroll-bar-present-in-collapsed-sidebar' into ↵Annabel Dunstone Gray2016-09-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' 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
| * | | Removed horizontal overflow from collapsed issuable sidebar21895-horizontal-scroll-bar-present-in-collapsed-sidebarLuke Bennett2016-09-121-1/+1
| | | |
* | | | Merge branch '21877-no-mr-branch-title-link-in-issue-on-mobile' into 'master' Annabel Dunstone Gray2016-09-134-6/+11
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Used flexbox to force related merge request list items into columned items21877-no-mr-branch-title-link-in-issue-on-mobileLuke Bennett2016-09-093-2/+11
| | | |
| * | | Removed media query declaration relating to merge-request-info and issue-infoLuke Bennett2016-09-071-4/+0
| | | |
* | | | Merge branch 'fix-commit-status' into 'master' Rémy Coutable2016-09-133-36/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an error where we were unable to create a CommitStatus for running state Due to severe refactoring of Pipeline we introduced regression in how CommitStatus is handled. We received an report that it's impossible to create a CommitStatus with state `running` when there were not previous status. The support for Commit Statuses should be simplified. Right now I'm doing minimal change to move forward and fix a bug, but I'll create a new MR that will move all logic that is now part of `lib/api/commit_statuses.rb` to separate service to simplify the implementation. This error happens due to the fact that we introduced additional status of builds: `created`. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21345 See merge request !6107
| * | | | Fix an error where we were unable to create a CommitStatus for running statefix-commit-statusKamil Trzcinski2016-09-123-36/+58
| | | | |
* | | | | Merge branch ↵Rémy Coutable2016-09-137-173/+81
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19694-remove-duplication-between-project-builds-and-admin-builds-view' into 'master' Remove duplication between project builds and admin builds view Closes #19694 See merge request !5680
| * | | | | Remove unnecessary variablesKatarzyna Kobierska2016-09-132-8/+8
| | | | | |
| * | | | | Code refactoringKatarzyna Kobierska2016-09-133-11/+14
| | | | | |
| * | | | | Improve build_path name and admin variableKatarzyna Kobierska2016-09-135-14/+13
| | | | | |
| * | | | | Fix error in pathsKatarzyna Kobierska2016-09-131-6/+5
| | | | | |
| * | | | | Build path with callKatarzyna Kobierska2016-09-134-30/+6
| | | | | |
| * | | | | Create shared partial for project and admin buildsKatarzyna Kobierska2016-09-136-93/+46
| | | | | |
| * | | | | Moved build tabs partial to sharedKatarzyna Kobierska2016-09-133-2/+2
| | | | | |
| * | | | | Improve table code and add CHANGELOGKatarzyna Kobierska2016-09-132-4/+3
| | | | | |
| * | | | | Improve code in table partialKatarzyna Kobierska2016-09-131-3/+4
| | | | | |
| * | | | | Improve codeKatarzyna Kobierska2016-09-135-10/+11
| | | | | |
| * | | | | Liken admin and project builds views to each otherKatarzyna Kobierska2016-09-133-43/+31
| | | | | |
| * | | | | Move builds content list to partialKatarzyna Kobierska2016-09-133-40/+45
| | | | | |
View Lorry Controller Status