Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make sure API responds with 401 when invalid authentication info is provideddm-api-unauthorized | Douwe Maan | 2017-09-28 | 2 | -16/+38 |
| | |||||
* | Merge branch ↵ | Rémy Coutable | 2017-09-27 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | '37467-helper-method-from-users-endpoint-overrides-api-helper-method' into 'master' find_user users helper method no longer overrides find_user API helper method. Closes #37467 See merge request gitlab-org/gitlab-ce!14418 | ||||
| * | find_user users helper method no longer overrides find_user API helper method.37467-helper-method-from-users-endpoint-overrides-api-helper-method | Tiago Botelho | 2017-09-26 | 1 | -2/+2 |
| | | |||||
* | | Add a spec for Github::Client and revert an `if !` to `unless`38198-fetch-github-api-per-100 | Rémy Coutable | 2017-09-26 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Retrieve PR comments only when we know there are any | Rémy Coutable | 2017-09-26 | 2 | -20/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | The Pull Request resource doesn't include the `comments` field, while the Issue resource does. And since we're looping through all issues anyway, we can freely check if the issue is a PR and has comments and in this case only fetch comments for it. That means if you have 1000 PRs but only 200 with comments, you will do 200 API requests instead of 1000. :notbad: Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Fetch 100 results when calling the GitHub API in Github::Import | Rémy Coutable | 2017-09-26 | 1 | -6/+6 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'dm-simple-project-avatar-url' into 'master' | Rémy Coutable | 2017-09-26 | 1 | -5/+6 |
|\ \ | | | | | | | | | | | | | Expose avatar_url when requesting list of projects from API with simple=true See merge request gitlab-org/gitlab-ce!14498 | ||||
| * | | Expose avatar_url when requesting list of projects from API with simple=truedm-simple-project-avatar-url | Douwe Maan | 2017-09-26 | 1 | -5/+6 |
| | | | |||||
* | | | Merge branch 'dm-bitbucket-import-truncated-shas' into 'master' | Robert Speicher | 2017-09-26 | 3 | -10/+32 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug that caused merge requests with diff notes imported from Bitbucket to raise errors Closes #38100 See merge request gitlab-org/gitlab-ce!14438 | ||||
| * | | | Remove unnecessary comments | Douwe Maan | 2017-09-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | Properly compare diff refs and diff positions when shas are truncated | Douwe Maan | 2017-09-25 | 2 | -8/+25 |
| | | | | |||||
| * | | | Expand truncated Bitbucket pull request source/target SHA if possible | Douwe Maan | 2017-09-25 | 1 | -2/+7 |
| | |/ | |/| | |||||
* | | | Expose last pipeline details in API response when getting a single commit | Mehdi Lahmam | 2017-09-26 | 1 | -0/+1 |
| |/ |/| | | | | | Closes #35692. | ||||
* | | Remove dead `Gitlab::Markdown::Pipeline` classrs-remove-dead-markdown-pipeline | Robert Speicher | 2017-09-25 | 1 | -32/+0 |
| | | |||||
* | | Migrate Gitlab::Git::Repository#log to Gitaly | Kim "BKC" Carlbäcker | 2017-09-25 | 3 | -1/+35 |
|/ | |||||
* | Merge branch '38280-undefined-run_command-when-running-rake-gitlab-check' ↵ | Douwe Maan | 2017-09-25 | 2 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | into 'master' Resolve "Undefined run_command when running rake gitlab:check" Closes #38280 See merge request gitlab-org/gitlab-ce!14469 | ||||
| * | Fixed few gitlab:check tasks that were failing with exception38280-undefined-run_command-when-running-rake-gitlab-check | Gabriel Mazetto | 2017-09-25 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'rs-allow-name-on-anchors' into 'master' | Douwe Maan | 2017-09-25 | 1 | -1/+2 |
|\ \ | |/ |/| | | | | | | | | | Re-allow `name` attribute on user-provided anchor HTML Closes #38196 See merge request gitlab-org/gitlab-ce!14452 | ||||
| * | Re-allow `name` attribute on user-provided anchor HTML | Robert Speicher | 2017-09-22 | 1 | -1/+2 |
| | | |||||
* | | Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master' | Douwe Maan | 2017-09-22 | 5 | -10/+72 |
|\ \ | | | | | | | | | | | | | | | | | | | Allow the git circuit breaker to correctly handle missing repository storages Closes #36549 See merge request gitlab-org/gitlab-ce!14417 | ||||
| * | | Allow the git circuit breaker to correctly handle missing repository storages | Nick Thomas | 2017-09-22 | 5 | -10/+72 |
| | | | |||||
* | | | Workaround for #38259 | Andrew Newdigate | 2017-09-22 | 1 | -2/+5 |
| |/ |/| | |||||
* | | Merge branch 'feature/migrate-repository-diff' into 'master' | Douwe Maan | 2017-09-22 | 4 | -15/+60 |
|\ \ | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#diff to Gitaly Closes gitaly#524 See merge request gitlab-org/gitlab-ce!14251 | ||||
| * | | Migrate Gitlab::Git::Repository#diff to Gitalyfeature/migrate-repository-diff | Ahmad Sherif | 2017-09-21 | 4 | -15/+60 |
| | | | | | | | | | | | | Closes gitaly#524 | ||||
* | | | Merge branch '38197-fix-ImapAuthenticationCheck' into 'master' | Douwe Maan | 2017-09-22 | 1 | -17/+28 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix `rake gitlab:incoming_email:check` Closes #38197 See merge request gitlab-org/gitlab-ce!14423 | ||||
| * | | | Fix rake gitlab:incoming_email:check and make it38197-fix-ImapAuthenticationCheck | Lin Jen-Shin | 2017-09-22 | 1 | -17/+28 |
| | | | | | | | | | | | | | | | | report error properly, so that we know what's really wrong. | ||||
* | | | | Merge branch '33328-usage-ping-for-gitlab-features-and-components' into 'master' | Rémy Coutable | 2017-09-22 | 1 | -10/+36 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds gitlab features and components to usage ping data. Closes #33328 See merge request gitlab-org/gitlab-ce!14305 | ||||
| * | | | | Adds gitlab features and components to usage ping data.33328-usage-ping-for-gitlab-features-and-components | Tiago Botelho | 2017-09-21 | 1 | -10/+36 |
| | | | | | |||||
* | | | | | Merge branch 'sh-blob-raw-check' into 'master' | Douwe Maan | 2017-09-22 | 1 | -0/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Ensure that Blob.raw returns always returns a valid blob object See merge request gitlab-org/gitlab-ce!14412 | ||||
| * | | | | Ensure that Blob.raw returns always returns a valid blob objectsh-blob-raw-check | Stan Hu | 2017-09-21 | 1 | -0/+2 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | In gitlab-org/gitlab-ee!2976, we saw that a given OID could point to a commit, which would cause the delta size check to fail. Gitaly already returns nil if the OID isn't a blob, so this change makes the Rugged implementation consistent. | ||||
* | | | | Resolve "Better SVG Usage in the Frontend" | Tim Zallmann | 2017-09-22 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'fix-multi-line-hook-output' into 'master' | Rémy Coutable | 2017-09-22 | 1 | -3/+4 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Display full pre-receive and post-receive hook output in GitLab UI Closes #25214 See merge request gitlab-org/gitlab-ce!14222 | ||||
| * | | | Display full pre-receive and post-receive hook output in GitLab UI | Robin Bobbitt | 2017-09-21 | 1 | -3/+4 |
| |/ / | |||||
* | | | Merge branch 'bvl-transient-failure-health-controller-spec' into 'master' | Douwe Maan | 2017-09-21 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't memoize storage configuration on `FsShardsCheck` Closes #38140 See merge request gitlab-org/gitlab-ce!14419 | ||||
| * | | | Don't memoize storage configuration on `FsShardsCheck`bvl-transient-failure-health-controller-spec | Bob Van Landuyt | 2017-09-21 | 1 | -2/+2 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | These values are already coming from memory, so we don't need to memoize. If we do memoize these, than the would not be stubbed when calling `stub_storage_settings` in specs | ||||
* | | | Merge branch 'dm-closing-issue-urls' into 'master' | Robert Speicher | 2017-09-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Correctly detect multiple issue URLs after 'Closes...' in MR descriptions Closes #33745 See merge request gitlab-org/gitlab-ce!14411 | ||||
| * | | | Correctly detect multiple issue URLs after 'Closes...' in MR descriptionsdm-closing-issue-urls | Douwe Maan | 2017-09-21 | 1 | -1/+1 |
| |/ / | |||||
* | | | Adds EE tag detection to remove_old in gitlab backup. | Tiago Botelho | 2017-09-21 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'gitlab-git-popen' into 'master' | Douwe Maan | 2017-09-20 | 4 | -8/+14 |
|\ \ | | | | | | | | | | | | | | | | | | | Use Gitlab::Git's Popen on that module's code Closes gitaly#597 See merge request gitlab-org/gitlab-ce!14237 | ||||
| * | | Use Gitlab::Git's Popen on that module's codegitlab-git-popen | Alejandro Rodríguez | 2017-09-20 | 4 | -8/+14 |
| |/ | | | | | | | | | This allows the current Gitaly migration to depend on less code outside of the Gitlab::Git module | ||||
* | | Merge branch '32796-tighten-up-remove-old-while-backing-up-gitlab' into 'master' | Rémy Coutable | 2017-09-20 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Tighten up remove_old regex from gitlab backup manager. Closes #32796 See merge request gitlab-org/gitlab-ce!14333 | ||||
| * | | Tighten up remove_old regex from gitlab backup manager.32796-tighten-up-remove-old-while-backing-up-gitlab | Tiago Botelho | 2017-09-20 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '37713-enable-ee_compat_check-for-forks' into 'master' | Rémy Coutable | 2017-09-20 | 2 | -2/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Enable ee_compat_check for forks, but not EE Closes #37713 See merge request gitlab-org/gitlab-ce!14189 | ||||
| * | | | Update ee_compat_check for community contributors37713-enable-ee_compat_check-for-forks | Lin Jen-Shin | 2017-09-15 | 1 | -1/+6 |
| | | | | |||||
| * | | | Enable ee_compat_check for forks, but not EE | Lin Jen-Shin | 2017-09-15 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | We exclude known EE projects, and check the project directory name for EE forks. | ||||
* | | | | Fix rewriting issue references with group milestones | Grzegorz Bizon | 2017-09-20 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge branch '20049-projects-api-forks' into 'master' | Rémy Coutable | 2017-09-20 | 1 | -4/+19 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Resolve "make project data via API report forks of this project" Closes #20049 See merge request gitlab-org/gitlab-ce!14355 | ||||
| * | | | Add an API endpoint to determine the forks of a project | Mark Fletcher | 2017-09-20 | 1 | -4/+19 |
| | | | | |||||
* | | | | Merge branch 'fix/gitaly-commit-diff-rpc-encoding-error' into 'master' | Robert Speicher | 2017-09-20 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode paths properly for Gitaly Commit{Diff,Delta} Closes gitaly#589 See merge request gitlab-org/gitlab-ce!14361 | ||||
| * | | | | Encode paths properly for Gitaly Commit{Diff,Delta}fix/gitaly-commit-diff-rpc-encoding-error | Ahmad Sherif | 2017-09-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Fixes gitaly#589 |