summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Guard against nil Sidekiq metrics serversh-guard-against-nil-sidekiq-metrics-serverStan Hu2018-02-201-1/+1
| | | | Closes #41351
* Merge branch '43424-put_all_event_metrics_behind_feature_flags' into 'master'Douwe Maan2018-02-201-2/+3
|\ | | | | | | | | | | | | Fix for sidekiq metrics set cardinality growing unbounded Closes #43424 See merge request gitlab-org/gitlab-ce!17235
| * Only use features for eventsPawel Chojnacki2018-02-201-3/+3
| |
| * Put all event metrics exposed to prometheus behind a feature flagPawel Chojnacki2018-02-201-0/+1
| |
* | [GH Import] Create an empty wiki if wiki import failedValery Sizov2018-02-191-0/+1
| |
* | Merge branch 'jej/avoid-slow-file-lock-checks' into 'master'Sean McGivern2018-02-192-3/+8
|\ \ | | | | | | | | | | | | | | | | | | Avoid slow File Lock checks when not used Closes #43339 See merge request gitlab-org/gitlab-ce!17140
| * | Avoid slow File Lock checks when not usedJames Edwards-Jones2018-02-192-3/+8
| | | | | | | | | | | | | | | Also avoid double commit lookup during file lock check by reusing memoized commits.
* | | Merge branch '32564-fix-double-system-closing-notes' into 'master'Sean McGivern2018-02-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Double closing system notes when closing issue with Merge Request" Closes #32546 and #32564 See merge request gitlab-org/gitlab-ce!17035
| * | | Convert Gitaly commit parent IDs to array as early as possibleSean McGivern2018-02-191-10/+1
| | | | | | | | | | | | | | | | | | | | The tracking issue if this causes problems is https://gitlab.com/gitlab-org/gitaly/issues/1028
| * | | applying feedback32564-fix-double-system-closing-notesMicaël Bergeron2018-02-161-1/+2
| | | | | | | | | | | | | | | | # modified: lib/gitlab/git/commit.rb
| * | | fix specsMicaël Bergeron2018-02-161-0/+8
| | | |
* | | | Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'Sean McGivern2018-02-191-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix squash rebase not working when diff contained encoded data Closes gitlab-ee#4960 See merge request gitlab-org/gitlab-ce!17205
| * | | | Fix squash rebase not working when diff contained encoded datash-fix-squash-rebase-utf8-dataStan Hu2018-02-181-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the applied diff contains UTF-8 or some other encoded data, the diff returned back from the git process may be in ASCII-8BIT format. Writing this data to stdin may fail if the data because stdin expects this data to be in UTF-8. By switching the output to binmode, we ensure that the diff will always be written as-is. Closes gitlab-org/gitlab-ee#4960
* | | | Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master'Douwe Maan2018-02-191-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when viewing a commit with a GPG signature in Geo Closes gitlab-ee#4825 See merge request gitlab-org/gitlab-ce!17207
| * | | | Fix Error 500 when viewing a commit with a GPG signature in GeoStan Hu2018-02-191-1/+3
| |/ / / | | | | | | | | | | | | Closes gitlab-org/gitlab-ee#4825
* | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵Douwe Maan2018-02-191-6/+22
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Sanitize extra blank spaces used when uploading a SSH key Closes #40552 See merge request gitlab-org/gitlab-ce!17138
| * | | Validate SSH keys through the sshkey gemrd-40552-gitlab-should-check-if-keys-are-valid-before-savingRubén Dávila2018-02-161-1/+1
| | | |
| * | | Revert "Merge branch ↵Rubén Dávila2018-02-151-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master'" This reverts commit e607fd796657afd214b8f25201919d3e33b3f35f.
* | | | Merge branch '42050-combine-all-rake-based-lints-in-one-rake-process-in-ci' ↵Robert Speicher2018-02-161-0/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Combine all rake based lints in one rake process in CI" Closes #42050 See merge request gitlab-org/gitlab-ce!16732
| * | | | Run lint:all tasks in forks42050-combine-all-rake-based-lints-in-one-rake-process-in-ciRémy Coutable2018-02-141-11/+32
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Combine all rake tasks in the static-analysis jobRémy Coutable2018-02-141-0/+28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Fix project import API after import service refactorJames Lopez2018-02-161-2/+6
| | | | |
* | | | | Merge branch '41899-api-endpoint-for-importing-a-project-export' into 'master'Sean McGivern2018-02-163-0/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API endpoint for importing a project export" Closes #41899 See merge request gitlab-org/gitlab-ce!17025
| * | | | | update docsJames Lopez2018-02-161-1/+1
| | | | | |
| * | | | | refactor code based on feedback41899-api-endpoint-for-importing-a-project-exportJames Lopez2018-02-141-1/+1
| | | | | |
| * | | | | refactor code based on feedbackJames Lopez2018-02-141-7/+10
| | | | | |
| * | | | | refactor api classJames Lopez2018-02-131-3/+5
| | | | | |
| * | | | | add docs and changelogJames Lopez2018-02-131-1/+1
| | | | | |
| * | | | | add more specsJames Lopez2018-02-131-6/+4
| | | | | |
| * | | | | fix entityJames Lopez2018-02-131-1/+3
| | | | | |
| * | | | | add import status endpointJames Lopez2018-02-131-8/+18
| | | | | |
| * | | | | fix file uploadJames Lopez2018-02-131-3/+4
| | | | | |
| * | | | | update import API and specJames Lopez2018-02-131-2/+2
| | | | | |
| * | | | | update import API and specJames Lopez2018-02-131-2/+5
| | | | | |
| * | | | | add post import API endpointJames Lopez2018-02-131-0/+48
| | | | | |
| * | | | | add entity and update specJames Lopez2018-02-132-0/+6
| | | | | |
* | | | | | Merge branch 'asciidoc_inter_document_cross_references' into 'master'Sean McGivern2018-02-161-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set Asciidoctor outfilesuffix to default .adoc Closes #43192 and #17602 See merge request gitlab-org/gitlab-ce!17125
| * | | | | | Set Asciidoctor outfilesuffix to default .adocTuro Soisenniemi2018-02-141-1/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without setting outfilesuffix Asciidoctor defaults to .html. When .html is used, inter-document cross references do not work in Gitlab's repository / file renderer. See more information from http://asciidoctor.org/docs/user-manual/#navigating-between-source-files and http://asciidoctor.org/docs/user-manual/#inter-document-cross-references
* | | | | | Merge branch 'update-profiler-docs-explaining-how-to-provide-user' into 'master'Sean McGivern2018-02-161-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation about how to provide a user to Gitlab::Profiler See merge request gitlab-org/gitlab-ce!17169
| * | | | | | Improve error handling for Gitlab::Profiler and improve doc about providing ↵update-profiler-docs-explaining-how-to-provide-userDylan Griffith2018-02-161-0/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | a user
* | | | | | Merge branch 'dm-escape-commit-message' into 'master'Sean McGivern2018-02-161-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape HTML entities in commit messages Closes #42833 See merge request gitlab-org/gitlab-ce!17144
| * | | | | Escape HTML entities in commit messagesDouwe Maan2018-02-151-1/+1
| | | | | |
* | | | | | Fixed bug with the user synced attributes when the user doesn't existfj-fixed-bug-17054Francisco Javier López2018-02-151-1/+1
|/ / / / /
* | | | | Fixed user synced attributes metadata after removing current providerFrancisco Javier López2018-02-152-2/+8
| | | | |
* | | | | Merge branch 'jej/fix-slow-lfs-object-check' into 'master'Douwe Maan2018-02-153-7/+11
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Only check LFS integrity for first branch in push Closes #41141 See merge request gitlab-org/gitlab-ce!17098
| * | | | Only check LFS integrity for first branch in pushjej/fix-slow-lfs-object-checkJames Edwards-Jones2018-02-153-7/+11
| | |_|/ | |/| |
* | | | Merge branch ↵Kamil Trzciński2018-02-141-2/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '39885-ensure-users-cannot-create-environments-with-leading-slashes' into 'master' Resolve "Environment with starting slash in name causes error" Closes #39885 See merge request gitlab-org/gitlab-ce!17071
| * | | Ensure users can't create environments with leading or trailing slashes ↵39885-ensure-users-cannot-create-environments-with-leading-slashesDylan Griffith2018-02-131-2/+6
| | | | | | | | | | | | | | | | (Fixes #39885)
* | | | Merge branch 'mk-fix-pg-undefined-table-ci-errors' into 'master'Rémy Coutable2018-02-142-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Build Is Red: Admin > Users > Impersonation Tokens token creation allows creation of a token" Closes gitlab-ee#4914 See merge request gitlab-org/gitlab-ce!17102
| * | | | Avoid dropping tables in testMichael Kozono2018-02-142-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And use :migration tag to use deletion strategy, and to avoid caching tables, and to lock into a particular schema. Attempting to fix intermittent spec errors `PG::UndefinedTable: ERROR: relation "public.untracked_files_for_uploads" does not exist`.
View Lorry Controller Status