summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Collapse)AuthorAgeFilesLines
* No more and/orDouwe Maan2017-02-212-2/+2
|
* Merge branch 'authentiq-backchannel-logout' into 'master' Douwe Maan2017-02-201-0/+11
|\ | | | | | | | | Remote logout functionality on Authentiq OAuth provider See merge request !9381
| * Added support for Authentiq Back-Channel LogoutAlexandros Keramidas2017-02-201-0/+11
| |
* | Merge branch 'fix/gb/remove-gitlab-ci-module' into 'master' Kamil Trzciński2017-02-171-8/+0
|\ \ | | | | | | | | | | | | Remove legacy GitlabCi module from initializers See merge request !9279
| * | Remove legacy GitlabCi module from initializersfix/gb/remove-gitlab-ci-moduleGrzegorz Bizon2017-02-151-8/+0
| | |
* | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-171-1/+0
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Resolve "Update global sidebar to dropdown" Closes #26200 See merge request !9199
| * | Remove all gitlab theme related codeAnnabel Dunstone Gray2017-02-151-1/+0
| |/
* | Set `Auto-Submitted: auto-generated` header to emailsSemyon Pupkov2017-02-151-0/+1
|/ | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20305
* rspec_profiling: Discover the correct branch name in GitLab CINick Thomas2017-02-101-0/+8
|
* Merge branch 'remove-sidekiq-backup-ar-threads' into 'master' Douwe Maan2017-02-061-3/+1
|\ | | | | | | | | | | | | Don't use backup AR connections for Sidekiq Closes #27713 See merge request !9001
| * Don't use backup AR connections for Sidekiqremove-sidekiq-backup-ar-threadsYorick Peterse2017-02-061-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding two extra connections does nothing other than increasing the number of idle database connections. Given Sidekiq uses N threads it can never use more than N AR connections at a time, thus we don't need more. The initializer mentioned the Sidekiq upgrade guide stating this was required. This is false, the Sidekiq upgrade guide states this is necessary for Redis and not ActiveRecord. On GitLab.com this resulted in a reduction of about 80-100 PostgreSQL connections. Fixes #27713
* | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-062-0/+40
|\ \ | |/ | | | | # Conflicts: # db/schema.rb
| * Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-032-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (181 commits) Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Fixed modal lists dropdown not updating when list is deleted Fixed remove btn error after creating new issue in list Removed duplicated test Removed Masonry, instead uses groups of data Uses mixins for repeated functions Fixed up specs Props use objects with required & type values Removes labels instead of closing issue when clicking remove button Fixed JS lint errors Fixed issue card spec Added webkit CSS properties Fixed bug with empty state showing after search Fixed users href path being incorrect Fixed bug where 2 un-selected issues would stay on selected tab Fixed DB schema Changed how components are added in objects Added remove button Add optional id property to the issue schema Fixed issue link href Disabled add issues button if no lists exist ...
| * | DRY with Gitlab.config.webpack.dev_server referenceswebpackMike Greiling2017-02-021-10/+12
| | |
| * | disable webpack proxy in rspec environment due to conflicts with webmock gemMike Greiling2017-02-021-12/+20
| | |
| * | add rack middleware to proxy webpack dev serverMike Greiling2017-02-012-0/+30
| | |
* | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-032-2/+2
|\ \ \ | | |/ | |/|
| * | PlantUML support for MarkdownHoracio Sanson2017-02-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow rendering of PlantUML diagrams in Markdown documents using fenced blocks: ```plantuml Bob -> Sara : Hello Sara -> Bob : Go away ``` Closes: #4048
| * | Don't require lib/gitlab/request_profiler/middleware.rb in ↵20452-remove-require-from-request_profiler-initializerRémy Coutable2017-02-021-2/+0
| |/ | | | | | | | | | | config/initializers/request_profiler.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Fix rubocop error from pages EE->CE portJames Edwards-Jones2017-02-021-1/+1
| |
* | Implement extra domains and save pages configurationKamil Trzcinski2017-01-311-1/+2
| |
* | Initial work on GitLab Pages updateKamil Trzcinski2017-01-311-0/+1
| |
* | Fix pages path settings option.Kamil Trzcinski2017-01-311-1/+1
| |
* | Fix pages storage pathKamil Trzcinski2017-01-311-1/+1
| |
* | Re-add missing gitlab_on_standard_portKamil Trzcinski2017-01-311-2/+6
| |
* | Change pages domain to hostKamil Trzcinski2017-01-311-1/+1
| |
* | Support https and custom port for pagesKamil Trzcinski2017-01-311-9/+19
| |
* | Add GitLab PagesKamil Trzcinski2017-01-311-0/+6
|/ | | | | | | | | | | | | | | | - The pages are created when build artifacts for `pages` job are uploaded - Pages serve the content under: http://group.pages.domain.com/project - Pages can be used to serve the group page, special project named as host: group.pages.domain.com - User can provide own 403 and 404 error pages by creating 403.html and 404.html in group page project - Pages can be explicitly removed from the project by clicking Remove Pages in Project Settings - The size of pages is limited by Application Setting: max pages size, which limits the maximum size of unpacked archive (default: 100MB) - The public/ is extracted from artifacts and content is served as static pages - Pages asynchronous worker use `dd` to limit the unpacked tar size - Pages needs to be explicitly enabled and domain needs to be specified in gitlab.yml - Pages are part of backups - Pages notify the deployment status using Commit Status API - Pages use a new sidekiq queue: pages - Pages use a separate nginx config which needs to be explicitly added
* Merge branch '27280-fix-unititalized-constant' into 'master' Robert Speicher2017-01-272-13/+1
|\ | | | | | | | | | | | | Resolve "NameError: uninitialized constant ApplicationSetting::DEFAULTS" Closes #27280 See merge request !8805
| * Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/27280-fix-unititalized-constantRémy Coutable2017-01-271-6/+0
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Move a begin/rescue clause to ApplicationSetting.expireRémy Coutable2017-01-271-7/+1
| | | | | | | | | | | | Also, remove non-existing Ci::ApplicationSetting.expire! Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Add the rspec_profiling gem and documentation to the GitLab development ↵23034-enable-rspec-profilingNick Thomas2017-01-271-0/+14
|/ | | | environment
* Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-251-0/+9
|\ | | | | | | | | | | | | Fix race conditions for AuthorizedProjectsWorker Closes #26194 and #26310 See merge request !8701
| * Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-251-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two cases that could be problematic: 1. Because sometimes AuthorizedProjectsWorker would be scheduled in a transaction it was possible for a job to run/complete before a COMMIT; resulting in it either producing an error, or producing no new data. 2. When scheduling jobs the code would not wait until completion. This could lead to a user creating a project and then immediately trying to push to it. Usually this will work fine, but given enough load it might take a few seconds before a user has access. The first one is problematic, the second one is mostly just annoying (but annoying enough to warrant a solution). This commit changes two things to deal with this: 1. Sidekiq scheduling now takes places after a COMMIT, this is ensured by scheduling using Rails' after_commit hook instead of doing so in an arbitrary method. 2. When scheduling jobs the calling thread now waits for all jobs to complete. Solution 2 requires tracking of job completions. Sidekiq provides a way to find a job by its ID, but this involves scanning over the entire queue; something that is very in-efficient for large queues. As such a more efficient solution is necessary. There are two main Gems that can do this in a more efficient manner: * sidekiq-status * sidekiq_status No, this is not a joke. Both Gems do a similar thing (but slightly different), and the only difference in their name is a dash vs an underscore. Both Gems however provide far more than just checking if a job has been completed, and both have their problems. sidekiq-status does not appear to be actively maintained, with the last release being in 2015. It also has some issues during testing as API calls are not stubbed in any way. sidekiq_status on the other hand does not appear to be very popular, and introduces a similar amount of code. Because of this I opted to write a simple home grown solution. After all, all we need is storing a job ID somewhere so we can efficiently look it up; we don't need extra web UIs (as provided by sidekiq-status) or complex APIs to update progress, etc. This is where Gitlab::SidekiqStatus comes in handy. This namespace contains some code used for tracking, removing, and looking up job IDs; all without having to scan over an entire queue. Data is removed explicitly, but also expires automatically just in case. Using this API we can now schedule jobs in a fork-join like manner: we schedule the jobs in Sidekiq, process them in parallel, then wait for completion. By using Sidekiq we can leverage all the benefits such as being able to scale across multiple cores and hosts, retrying failed jobs, etc. The one downside is that we need to make sure we can deal with unexpected increases in job processing timings. To deal with this the class Gitlab::JobWaiter (used for waiting for jobs to complete) will only wait a number of seconds (30 by default). Once this timeout is reached it will simply return. For GitLab.com almost all AuthorizedProjectWorker jobs complete in seconds, only very rarely do we spike to job timings of around a minute. These in turn seem to be the result of external factors (e.g. deploys), in which case a user is most likely not able to use the system anyway. In short, this new solution should ensure that jobs are processed properly and that in almost all cases a user has access to their resources whenever they need to have access.
* | Add metric initializer specadd-metrics-initializer-specSean McGivern2017-01-241-104/+115
|/ | | | | | | | | | An empty file in one of the instrumented directories will cause the app to fail to start when metrics are enabled. Metrics aren't enabled by default in development or test. We could handle the empty file case explicitly, but a file could still not define the constant it is expected to, so instead run the initializer manually in a spec and check that it succeeds.
* Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flagAhmad Sherif2017-01-181-0/+6
|
* Explain why there is a monkey-patchJacob Vosmaer2016-12-271-0/+6
|
* Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-261-1/+1
|\ | | | | | | | | Add more storage statistics See merge request !7754
| * Add more storage statisticsMarkus Koller2016-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This adds counters for build artifacts and LFS objects, and moves the preexisting repository_size and commit_count from the projects table into a new project_statistics table. The counters are displayed in the administration area for projects and groups, and also available through the API for admins (on */all) and normal users (on */owned) The statistics are updated through ProjectCacheWorker, which can now do more granular updates with the new :statistics argument.
* | Monkey-patch StrongParameters for ::UploadedFileJacob Vosmaer2016-12-231-0/+16
|/
* Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-191-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Gogs ImporterKim "BKC" Carlbäcker2016-12-191-1/+1
|
* Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' ↵Sean McGivern2016-12-171-1/+1
|\ | | | | | | | | | | | | | | | | | | into 'master' Enable Style/MultilineOperationIndentation in Rubocop Fixes #25741 See merge request !8125
| * Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-161-1/+1
| |
* | Fix rubocop failureszj-mattermost-sessionKamil Trzcinski2016-12-171-2/+2
| |
* | Store mattermost_url in settingsKamil Trzcinski2016-12-171-0/+7
| |
* | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-163-2/+7
|\ \ | |/
| * Calls to the API are checked for scope.Timothy Andrew2016-12-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the `Oauth2::AccessTokenValidationService` class to `AccessTokenValidationService`, since it is now being used for personal access token validation as well. - Each API endpoint declares the scopes it accepts (if any). Currently, the top level API module declares the `api` scope, and the `Users` API module declares the `read_user` scope (for GET requests). - Move the `find_user_by_private_token` from the API `Helpers` module to the `APIGuard` module, to avoid littering `Helpers` with more auth-related methods to support `find_user_by_private_token`
| * Merge branch 'katex-math' into 'master' Sean McGivern2016-12-151-0/+2
| |\ | | | | | | | | | | | | | | | | | | Render math in Asciidoc and Markdown with KaTeX using code blocks Closes #13690 and #13180 See merge request !8003
| | * Render math in Asciidoc and Markdown with KaTeX using code blocksMunken2016-12-141-0/+2
| | |