summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix static anlysys. Added safe_model_attributes.Shinya Maeda2017-10-042-1/+2
|
* Merge branch 'master' into ↵Shinya Maeda2017-10-042-1/+13
|\ | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * Merge branch '37970-timestamped-ci' into 'master'Kamil Trzciński2017-10-032-1/+13
| |\ | | | | | | | | | | | | Hide CI section markers from job trace See merge request gitlab-org/gitlab-ce!14393
| | * Expose GitLab features to the CI runner37970-timestamped-ciAlessio Caiazza2017-10-031-0/+1
| | |
| | * Hide CI section markers from job traceAlessio Caiazza2017-10-031-1/+12
| | |
* | | Add google_api to TOP_LEVEL_ROUTES. Import/Export model failure fix. Fix ↵Shinya Maeda2017-10-045-9/+11
| | | | | | | | | | | | static analysys.
* | | Merge branch 'master' into ↵Shinya Maeda2017-10-0412-6/+216
|\ \ \ | |/ / | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | Hide Gollum inside Gitlab::Git::WikiJacob Vosmaer (GitLab)2017-10-034-0/+192
| | |
| * | Restore User.from_gitalyJacob Vosmaer (GitLab)2017-10-031-0/+5
| | |
| * | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-10-0339-286/+661
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6 * upstream/master: (186 commits) Resolve "Precompiled assets with digest strings are ignored in CI" Fix navigation dropdown close animation on mobile screens Add (partial) index on Labels.template Add grpc.log for Gitaly Fix gitaly-proto version in Gemfile.lock refactor issues_controller_spec `update` action Remove edit action for issues Add documentation to summarise project archiving Fix for Gitaly nil encoding issue Fix broken certificate-authority-data with kubectl >= 1.8.0 Improve performance of filtering notes in NotesController Bump gitaly-proto version to v0.39.0 Fix specs for project creation and update services Add CHANGELOG Doesn't check if path exists on disk when renaming a hashed project [ci skip] Fix archive spec descrptions Only copy old/new code when selecting left/right side of parallel diff Fix gitlab-rake gitlab:import:repos task Send extra Gitaly params for `send_git_archive` if needed Update GitLab Pages to v0.6.0 ...
| | * \ Merge branch 'fix-kubectl-180' into 'master'Kamil Trzciński2017-10-031-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken certificate-authority-data with kubectl >= 1.8.0 Closes #38685 See merge request gitlab-org/gitlab-ce!14635
| | | * | Fix broken certificate-authority-data with kubectl >= 1.8.0fix-kubectl-180Alessio Caiazza2017-10-031-1/+1
| | | | |
| | * | | Fix for Gitaly nil encoding issueAndrew Newdigate2017-10-032-1/+3
| | | | |
| | * | | Merge branch 'gitaly-get-archive' into 'master'Douwe Maan2017-10-031-0/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Send extra Gitaly params for `send_git_archive` if needed See merge request gitlab-org/gitlab-ce!14605
| | | * | | Send extra Gitaly params for `send_git_archive` if neededAlejandro Rodríguez2017-10-021-0/+7
| | | | | |
| | * | | | Merge branch '38635-fix-gitlab-check-git-ssh-config' into 'master'Douwe Maan2017-10-031-0/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitelist authorized_keys.lock in the gitlab:check rake task Closes #38635 See merge request gitlab-org/gitlab-ce!14624
| | | * | | | Whitelist authorized_keys.lock in the gitlab:check rake taskNick Thomas2017-10-021-0/+1
| | | | | | |
| * | | | | | Freeze the constant arraygem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6Lin Jen-Shin2017-10-021-1/+1
| | | | | | |
| * | | | | | Just allow the scheme we want!Lin Jen-Shin2017-09-291-3/+5
| | | | | | |
| * | | | | | Adapt to the latest addressable behaviourLin Jen-Shin2017-09-291-2/+0
| | | | | | |
| * | | | | | Strip before passing to addressable, otherwise it's invalidLin Jen-Shin2017-09-281-1/+2
| | | | | | |
| * | | | | | Make sure we didn't blow up if URI is invalidLin Jen-Shin2017-09-281-0/+2
| | | | | | |
* | | | | | | Merge branch 'master' into ↵Shinya Maeda2017-10-0457-505/+1187
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | | | | | Merge branch 'sh-fix-import-repos' into 'master'Robert Speicher2017-10-021-1/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitlab-rake gitlab:import:repos task Closes #37682 See merge request gitlab-org/gitlab-ce!14597
| | * | | | | Fix gitlab-rake gitlab:import:repos taskStan Hu2017-10-021-1/+2
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of a change in GitLab 9.5.4 to prevent users from assuming control of a repository already on disk, the import task broke. Imports would fail with the message, "There is already a repository with that name on disk". This change skips the validation when the import is done from the command-line. Closes #37682
| * | | | | Merge branch 'log-update-ref-errors' into 'master'Sean McGivern2017-10-021-1/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log update-ref errors in OperationService See merge request gitlab-org/gitlab-ce!14627
| | * | | | | Log update-ref errors in OperationServiceJacob Vosmaer2017-10-021-1/+3
| | | | | | |
| * | | | | | Merge branch 'sh-thread-safe-markdown' into 'master'Robert Speicher2017-10-021-18/+14
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Redcarpet Markdown renderer thread-safe Closes #36637 See merge request gitlab-org/gitlab-ce!14604
| | * | | | | Make Redcarpet Markdown renderer thread-safeStan Hu2017-10-021-18/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Redcarpet library is not thread-safe as described in https://github.com/vmg/redcarpet/issues/570. Since we instantiate the Redcarpet renderer in a class variable, multiple Sidekiq threads can access the work buffer and corrupt the state. We work around this issue by memoizing the renderer on a thread basis. Closes #36637
| * | | | | | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'Douwe Maan2017-10-025-92/+67
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to link saml users to ldap by email Closes #33493 See merge request gitlab-org/gitlab-ce!14216
| | * | | | | | Refactors SAML identity creation in gl_user.Tiago Botelho2017-10-025-102/+58
| | | | | | | |
| | * | | | | | Creates compound query for LDAP email attributes.Tiago Botelho2017-09-252-7/+15
| | | | | | | |
| | * | | | | | Attempt to link saml users to ldap by emailTiago Botelho2017-09-253-8/+19
| | | | | | | |
| * | | | | | | Merge branch 'revert-configurable-size-limits' into 'master'Douwe Maan2017-10-021-37/+9
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall" See merge request gitlab-org/gitlab-ce!14628
| | * | | | | | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"Sean McGivern2017-10-021-37/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1d3c33b57eeb39df76e78fd37c86532c02aa22ac.
| * | | | | | | Merge branch 'sh-restore-all-refs-backup' into 'master'Sean McGivern2017-10-021-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure all refs are restored on a backup/restore Closes #38352 See merge request gitlab-org/gitlab-ce!14595
| | * | | | | | Ensure all refs are restored on a restore from backupsh-restore-all-refs-backupStan Hu2017-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To restore all refs from a bundle, we need to use the --mirror option to ensure that all refs are properly restored. Without this, refs such as `refs/merge-requests/X` and `refs/keep-around/Y` would be omitted, which exposed a bug as described in https://gitlab.com/gitlab-org/gitlab-ce/issues/38319#note_41648608. Closes #38352
| * | | | | | | Merge branch 'gitaly-add-branch' into 'master'Sean McGivern2017-10-023-9/+50
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement OperationService.UserAddBranch Gitaly RPC Closes gitaly#544 See merge request gitlab-org/gitlab-ce!14522
| | * | | | | | Implement OperationService.UserAddBranch Gitaly RPCgitaly-add-branchAlejandro Rodríguez2017-09-302-7/+47
| | | | | | | |
| | * | | | | | Populate `Gitlay::Repository`'s `gl_repository` fieldAlejandro Rodríguez2017-09-302-2/+3
| | |/ / / / /
| * | | | | | Merge branch '38571-fix-exception-in-raven-report' into 'master'Sean McGivern2017-10-021-3/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure no exception is raised when Raven tries to get the current user in API context Closes #38571 See merge request gitlab-org/gitlab-ce!14580
| | * | | | | | Ensure no exception is raised when Raven tries to get the current user in ↵38571-fix-exception-in-raven-reportRémy Coutable2017-09-291-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API context Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Merge branch 'remote_user' into 'master'Douwe Maan2017-10-025-22/+32
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Add GL_USERNAME environment variable for hooks See merge request gitlab-org/gitlab-ce!13264
| | * | | | | | add username to authorized result, so that gitlab-shell can pass it to hooksDavid Turner2017-09-293-7/+13
| | | | | | | |
| | * | | | | | Add username as GL_USERNAME in hooks (http)David Turner2017-09-293-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling pre-receive, post-receive, and update hooks, add the GitLab username as the GL_USERNAME environment variable. This patch only handles cases where pushes are over http, or via the web interface. Later, we will address the ssh case.
| | * | | | | | remove unused from_gitaly methodDavid Turner2017-09-291-4/+0
| | | |/ / / / | | |/| | | |
| * | | | | | Add environment variable to bypass n+1Andrew Newdigate2017-09-301-1/+1
| |/ / / / /
| * | | | | Create repositories via GitalyJacob Vosmaer2017-09-294-8/+22
| |/ / / /
| * | | | Merge branch ↵Rémy Coutable2017-09-291-5/+27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' Insert at most 1,000 rows at once in MR diff background migration Closes #36631 et #37505 See merge request gitlab-org/gitlab-ce!13661
| | * | | | Make MR diff background migration less likely to time outSean McGivern2017-09-291-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version does not use transactions, but individual statements. As we have unique constraints on the target tables for the inserts, we can just ignore uniqueness violations there (as long as we always insert the same batch size, in the same order). This means the spec now must use truncation, not a transaction, as the uniqueness violation means that the whole transaction for that spec would be invalid, which isn't what we'd want. In real-world use, this isn't run in a transaction anyway. This commit also wraps unhandled exceptions, for easier finding in Sentry, and logs with a consistent format, for easier searching.
View Lorry Controller Status