summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Allow replying to an individual note in the APIallow-replying-to-individual-notes-from-apiSean McGivern2019-05-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you can do this in the UI, you should be able to do it in the API. If a discussion is not a single note discussion, or it is replyable, you can reply to it.
* | | | | Fix issuables state_id nil when importing projects from GitHubFelipe Artur2019-05-063-0/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | Issues and merge requests imported from GitHub are having state_id set to null. This fixes the GitHub project importer and schedule migrations to fix state_id.
* | | | Implement support for CI variables of type fileKrasimir Angelov2019-05-064-1/+7
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Add env_var and file as supported types for CI variables. Variables of type file expose to users existing gitlab-runner behaviour - save variable value into a temp file and set the path to this file in an ENV var named after the variable key. Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/46806.
* | | Merge branch '30093-apply-bfg-object-map-to-database' into 'master'Douwe Maan2019-05-063-15/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove cleaned up OIDs from database and cache Closes #30093 See merge request gitlab-org/gitlab-ce!26555
| * | | Remove cleaned up OIDs from database and cacheNick Thomas2019-05-063-15/+35
| | | |
* | | | Merge branch 'jc-disconnect-git-alternates-client' into 'master'Stan Hu2019-05-062-0/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Add client methods for DisconnectGitAlternates rpc See merge request gitlab-org/gitlab-ce!27938
| * | | Add client methods for DisconnectGitAlternates rpcjc-disconnect-git-alternates-clientJohn Cai2019-05-032-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | DisconnectGitAlternates is a Gitaly RPC that will delete a repository's objects/info/alternates file. This commit adds client support for that RPC.
* | | | Merge branch 'jej/session-stored-globaly' into 'master'Dmitriy Zaporozhets2019-05-062-0/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Session stored globally per request See merge request gitlab-org/gitlab-ce!27658
| * | | | Session stored globally per requestjej/session-stored-globalyJames Edwards-Jones2019-05-022-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | - This can be accessed with Session.current and is restored after. - Data can be stored under a key with NamespacedSessionStore
* | | | | Merge branch 'ce-11225-es_limited_namespaces_removal' into 'master'Nick Thomas2019-05-061-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport "Fix namespace/project removal elasticsearch limit" to CE See merge request gitlab-org/gitlab-ce!27933
| * | | | | Backport of 328-versioned-es-schemace-11225-es_limited_namespaces_removalMario de la Ossa2019-05-021-0/+6
| | | | | |
* | | | | | Merge branch 'patch-49' into 'master'Sean McGivern2019-05-061-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No leading/trailing spaces when generating heading ids (Fixes #57528) Closes #57528 See merge request gitlab-org/gitlab-ce!27025
| * | | | | | Use strip to remove leading/trailing spacesWillian Balmant2019-04-111-2/+1
| | | | | | | | | | | | | | | | | | | | | Change based on comments in MR #27025
| * | | | | | No leading/trailing spaces when generating heading ids (Fixes #57528)Willian Balmant2019-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | Update based on comments in MR #27025
| * | | | | | No leading/trailing spaces when generating heading ids (Fixes #57528)Willian Balmant2019-04-041-0/+2
| | | | | | |
* | | | | | | Run rubocop -a on CE filessh-upgrade-rubocop-0.68.0-ceStan Hu2019-05-0535-51/+40
| | | | | | |
* | | | | | | Revert changes in lib/tasks/lint.rakeStan Hu2019-05-051-2/+15
| | | | | | |
* | | | | | | Remove stdout/stderr capture in static-analysisStan Hu2019-05-051-15/+1
| | | | | | |
* | | | | | | Add logging for time and lint startStan Hu2019-05-051-0/+1
| | | | | | |
* | | | | | | Allow guests users to access project releasesKrasimir Angelov2019-05-032-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is step one of resolving https://gitlab.com/gitlab-org/gitlab-ce/issues/56838. Here is what changed: - Revert the security fix from bdee9e8412d. - Do not leak repository information (tag name, commit) to guests in API responses. - Do not include links to source code in API responses for users that do not have download_code access. - Show Releases in sidebar for guests. - Do not display links to source code under Assets for users that do not have download_code access. GET ':id/releases/:tag_name' still do not allow guests to access releases. This is to prevent guessing tag existence.
* | | | | | | Propagate excluded paths to SAST & DS jobsFabien Catteau2019-05-032-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate DS_EXCLUDED_PATHS to dependency_scanning job, and SAST_EXCLUDED_PATHS and SAST_BANDIT_EXCLUDED_PATHS to sast job. This makes possible to excluded certains paths from SAST reports and Dependency Scanning reports, respectively.
* | | | | | | Whitelist query limits for internal APIStan Hu2019-05-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a merge request for push options, there may be over 100 queries that are run to create a merge request. Even after we reduce the number of queries by disabling the Sidekiq jobs, it appears we still hover near this limit. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11450
* | | | | | | Add gitlab-managed option to clusters formMayra Cabrera2019-05-032-0/+2
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this option is enabled, GitLab will create namespaces and service accounts as usual. When disabled, GitLab wont create any project specific kubernetes resources Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56557
* | | | | | Use git_garbage_collect_worker to run pack_refsJan Provaznik2019-05-021-0/+6
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackRefs is not an expensive gitaly call - we want to call it more often (than as part of full `gc`) because it helps to keep number of refs files small - too many refs file may be a problem for deployments with slow storage.
* | | | | Adds a way to start multiple manual jobs in stageMayra Cabrera2019-05-022-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds an endpoint on PipelinesController - Adds a service that iterates over every build in a stage and plays it. - Includes 'play_manual' details on EntitySerializer - Builds a new Stage state: PlayManual. An stage can take this status if it has manual builds or an skipped, scheduled or manual status - Includes FE modifications and specs
* | | | | Add support for two-step Gitaly Rebase RPCLuke Duncalfe2019-05-022-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new two-step Gitaly `Rebase` RPC yields the rebase commit SHA to the client before proceeding with the rebase. This avoids an issue where the rebase commit SHA was returned when the RPC had fully completed, and in some cases this would be after the Rails `post_receive` worker services had already run. In these situations, the merge request did not yet have its rebase_commit_sha attribute set introducing the possibility for bugs (such as previous approvals being reset). https://gitlab.com/gitlab-org/gitlab-ee/issues/5966
* | | | | Merge branch '27777-drop-projects-ci_id-column' into 'master'Douglas Barbosa Alexandre2019-05-021-13/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Drop "projects"."ci_id" column" Closes #27777 See merge request gitlab-org/gitlab-ce!27623
| * | | | | Remove unused projects.ci_id column27777-drop-projects-ci_id-columnDmitriy Zaporozhets2019-05-021-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And remove Gitlab::Ci::Trace#deprecated_path as it relies on ci_id Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Update deployment chat message notificationJason Goodman2019-05-022-1/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | Include link to user and commit title. Rearrange text
* | | | | Add opentracing integration for graphqlJan Provaznik2019-05-021-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends existing graphql's tracer with opentracing measurements. Because it also adds Tracing::Graphql class (for opentracing), it also renames Graphql::Tracing class to Graphql::GenericTracing to minimize confusion with similar class names.
* | | | | Propagate ENV vars to SAST and Dependency Scanning Docker containers only if ↵Victor Zagorodny2019-05-012-18/+38
| | | | | | | | | | | | | | | | | | | | they are set
* | | | | Merge branch 'bvl-upload-designs-fix-ce' into 'master'Douwe Maan2019-05-012-3/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make Gitlab::GlRepository#types an instance method See merge request gitlab-org/gitlab-ce!27902
| * | | | | Make Gitlab::GlRepository#types an instance methodBob Van Landuyt2019-04-302-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having this as an instance method makes it easier to override in the prepended `EE` module. If we try to override this method on the module itself, it would not be overridden correctly, depending on the load order.
* | | | | | Update metrics dashboard API to load yml from repoSarah Yasonik2019-05-019-47/+231
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the EnvironmentController#metrics_dashboard endpoint to support a "dashboard" param, which can be used to specify the filepath of a dashboard configuration from a project repository. Dashboard configurations are expected to be stored in .gitlab/dashboards/. Updates dashboard post-processing steps to exclude custom metrics, which should only display on the system dashboard.
* | | | | Merge branch 'feat/sentry-environment' into 'master'Douglas Barbosa Alexandre2019-04-301-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | feat: add option to define the Sentry Environment See merge request gitlab-org/gitlab-ce!27091
| * | | | | feat: allow Sentry configuration to be passed on gitlab.ymlRoger Meier2019-04-301-1/+6
| |/ / / /
* | | | | Merge branch 'jc-client-for-fetch-objects-into-pool' into 'master'Stan Hu2019-04-302-0/+13
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Add client methods for FetchIntoObjectPool RPC See merge request gitlab-org/gitlab-ce!27767
| * | | | Add client methods for FetchIntoObjectPool RPCJohn Cai2019-04-302-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly's FetchIntoObjectPool RPC will idempotently fetch objects into an object pool. If the pool doesn't exist, it will create an empty pool before attempting the fetch. This change adds client code as well as specs to cover this behavior.
* | | | | Merge branch 'pl-fix-k8s-ns-query-variables' into 'master'Grzegorz Bizon2019-04-301-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use correct k8s namespace in Prometheus queries See merge request gitlab-org/gitlab-ce!27812
| * | | | | Use correct k8s namespace in Prometheus queriesPeter Leitzen2019-04-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit the wrong namespace could have been used in Prometheus queries for group-level installations.
* | | | | | Docs aren't reviewed using rouletteEvan Read2019-04-301-4/+4
| | | | | |
* | | | | | Teach Helm::Api about #uninstallThong Kuah2019-04-291-0/+7
| | | | | |
* | | | | | Merge branch '6565-move-sidekiq-cluster-ce' into 'master'Robert Speicher2019-04-291-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Change comments to point to the new path of sidekiq-cluster See merge request gitlab-org/gitlab-ce!27707
| * | | | | Change path of bin/sidkiq-cluster in commentsHossein Pursultani2019-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `sidekiq-cluster` is moved from `bin/` to `ee/bin` in EE code. This is a corresponding change in CE.
* | | | | | Merge branch 'use-keyword-args-for-databuilder-push' into 'master'Douglas Barbosa Alexandre2019-04-291-2/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use keyword args for databuilder push See merge request gitlab-org/gitlab-ce!24088
| * | | | | | Use all keyword args for DataBuilder::Push.build()Jonathon Reinhart2019-04-251-2/+10
| |/ / / / /
* | | | | | Merge remote-tracking branch 'origin/master'John T Skarbek2019-04-2918-10/+501
|\ \ \ \ \ \
| * | | | | | Fix slow performance with compiling HAML templatesStan Hu2019-04-291-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5, including `ActionView::Context` can have a significant and hidden performance penalty because this module also includes `ActionView::CompiledTemplates`. This means that any module that includes ActionView::Context becomes a descendant of `CompiledTemplates`. When a partial is rendered for the first time, it runs `ActionView::CompiledTemplates#module_eval`, which will evaluate a string that defines a new method for that partial. For example, the source of partial might be this string: ``` def _app_views_project_show_html_haml___12345(local_assigns, output) "hello world" end ``` When this string is evaluated, the Ruby interpreter will define the method and clear the global method cache for all descendants of `ActionView::CompiledTemplates`. Previous to this change, we inadvertently made a number of modules fall into this category: * GroupChildEntity * NoteUserEntity * Notify * MergeRequestUserEntity * AnalyticsCommitEntity * CommitEntity * UserEntity * Kaminari::Helpers::Paginator * CurrentUserEntity * ActionView::Base * ActionDispatch::DebugExceptions::DebugView * MarkupHelper * MergeRequestPresenter After this change: * Kaminari::Helpers::Paginator * ActionView::Base * ActionDispatch::DebugExceptions::DebugView Each time a partial is rendered for the first time, all methods for those modules will have to be redefined. This can exact a significant performance penalty. How bad is this penalty? Using the following benchmark script, we can use DTrace to sample the Ruby interpreter: ``` Benchmark.bm do |x| x.report do 1000.times do ActionView::CompiledTemplates.module_eval("def testme\nend") end end end ``` This revealed a 11x jump in the time spent in `core#define_method` alone. Rails 6 fixes this behavior by moving the `include CompiledTemplates` into ActionView::Base so that including `ActionView::Context` doesn't quietly affect other modules in this way. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11198
| * | | | | | Merge branch 'bvl-initialize-design-repo-ce' into 'master'Douwe Maan2019-04-292-1/+11
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Port changes for design management to CE See merge request gitlab-org/gitlab-ce!27555
| | * | | | | Port changes for design management to CEBob Van Landuyt2019-04-292-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ports the changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10462/ to CE
View Lorry Controller Status