summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Collapse)AuthorAgeFilesLines
* Upgraded Sidekiq to 4.xfeature/sidekiq-4Gabriel Mazetto2015-12-101-0/+8
|
* Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-101-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/markdown/autolink_filter_spec.rb # spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb # spec/lib/gitlab/markdown/commit_reference_filter_spec.rb # spec/lib/gitlab/markdown/cross_project_reference_spec.rb # spec/lib/gitlab/markdown/emoji_filter_spec.rb # spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/external_link_filter_spec.rb # spec/lib/gitlab/markdown/issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/label_reference_filter_spec.rb # spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb # spec/lib/gitlab/markdown/redactor_filter_spec.rb # spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb # spec/lib/gitlab/markdown/relative_link_filter_spec.rb # spec/lib/gitlab/markdown/sanitization_filter_spec.rb # spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb # spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb # spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb # spec/lib/gitlab/markdown/task_list_filter_spec.rb # spec/lib/gitlab/markdown/upload_link_filter_spec.rb # spec/lib/gitlab/markdown/user_reference_filter_spec.rb
| * Use devise paranoid mode and ensure the same message is returned every timeDrew Blessing2015-12-091-1/+1
| | | | | | | | Skipped CI because it has already passed. Had to rebase due to CHANGELOG.
* | Merge branch 'reference-pipeline-and-caching' into 'master' Robert Speicher2015-12-081-1/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Implement different Markdown rendering pipelines and cache Markdown Builds on !1090. Related to !1014. Fixes #2054. See merge request !1602
| * Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-081-0/+6
| |\
| * \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-071-1/+1
| |\ \
| * \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0210-27/+46
| |\ \ \
| * \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-11-196-50/+29
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-271-1/+3
| |\ \ \ \ \
| * | | | | | Disabling caching in test environment because it was causing issues with ↵Douwe Maan2015-10-221-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Markdown
* | | | | | | Fix signin with OmniAuth providersfix-omniauth-signinDouwe Maan2015-12-081-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'feature/sidekiq-cron' into 'master' Dmitriy Zaporozhets2015-12-071-0/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate from Sidetiq to Sidekiq-cron Migrate from Sidetiq to Sidekiq-cron Updated Sidekiq to 3.5.x This will solve #2355 See merge request !1982
| * | | | | Migrate from Sidetiq to Sidekiq-cronfeature/sidekiq-cronGabriel Mazetto2015-12-041-0/+6
| | |_|_|/ | |/| | | | | | | | | | | | | Updated Sidekiq to 3.5.x
* | | | | Merge branch 'master' into link-refsDouwe Maan2015-12-029-20/+20
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-309-20/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
| | * | | | Migrate mailers to ActiveJobValery Sizov2015-11-261-1/+1
| | | | | |
| | * | | | Rails update to 4.2.4Valery Sizov2015-11-259-19/+19
| | | | | |
* | | | | | Have ClosingIssueExtractor recognize all referenced issuesDouwe Maan2015-11-301-1/+1
|/ / / / /
* | | | | Merge branch 'rs-build-ssh-path-prefix' into 'master' Douwe Maan2015-11-301-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify `build_gitlab_shell_ssh_path_prefix` See merge request !1928
| * | | | | Simplify `build_gitlab_shell_ssh_path_prefix`rs-build-ssh-path-prefixRobert Speicher2015-11-291-3/+5
| |/ / / /
* | | | | Gracefully handle when Redis is not availableStan Hu2015-11-261-2/+7
| | | | |
* | | | | Expire application settings from cache at startupStan Hu2015-11-251-0/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a DB migration occurs, there's a chance that the application settings are loaded from the cache and provide stale values, causing Error 500s. This ensures that at startup the settings are always refreshed. Closes #3643
* | | | Also fallback to a default value if none is set.session_expire_delay_cannot_be_nilMarin Jankovski2015-11-241-2/+2
| | | |
* | | | Maybe rescue session_expire_delay by setting a default value.Marin Jankovski2015-11-241-0/+1
| | | |
* | | | Expose artifacts pathci-artifacts-pathKamil Trzcinski2015-11-231-1/+8
| | | |
* | | | Lfs on by default.Marin Jankovski2015-11-191-1/+1
| |_|/ |/| |
* | | Add support for git lfs.lfsMarin Jankovski2015-11-161-0/+7
| | |
* | | Disabling cache for test environmentValery Sizov2015-11-161-9/+11
| | |
* | | Expose CI enable option in project featuresKamil Trzcinski2015-11-131-0/+1
| | | | | | | | | | | | - Enable CI by default for all new projects
* | | Merge branch 'artifacts' into 'master' Kamil Trzciński2015-11-111-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Build Artifacts This implements #3028 1. It stores artifacts in shared/artifacts, 1. It adds `artifacts` to `.gitlab-ci.yml`, 1. We use GitLab Workhorse to offload artifacts uploading, 1. To download artifacts it uses GitLab Workhorse X-Sendfile extension, 1. There's one "artifact" per-build. The new upload removes previous one and creates a new one, 1. Default max artifact size is set to 100MB - this can be changed in settings. Missing things: 1. Support for `.gitlab-ci.yml`: `artifacts: true or git-ls-files` which will upload all non tracked files, 1. Artifacts passing between builds. GitLab Workhorse changes: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/5 GitLab Runner changes: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/46 Syntax: ``` artifacts: untracked: true # default: false paths: # default: empty - bin/files ``` See merge request !1584
| * | | Final fixesKamil Trzcinski2015-11-101-1/+1
| | | |
| * | | Implement Build ArtifactsKamil Trzcinski2015-11-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Offloads uploading to GitLab Workhorse - Use /authorize request for fast uploading - Added backup recipes for artifacts - Support download acceleration using X-Sendfile
* | | | Merge branch 'state-machine-to-state-machines-activerecord' into 'master' Dmitriy Zaporozhets2015-11-101-9/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Switch to state_machines-activerecord (Fixes: #3374) state_machine is unmaintained See merge request !1764
| * | | remove state_machine_patch.rbPirate Praveen2015-11-091-9/+0
| | | |
| * | | Switch to state_machines-activerecord (Fixes: #3374)Pirate Praveen2015-11-081-1/+1
| | | |
* | | | Merge branch 'fix-incoming-email-default' into 'master' Robert Speicher2015-11-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incoming email config defaults Fixes #3377. See merge request !1766
| * | | | Fix incoming email config defaultsfix-incoming-email-defaultDouwe Maan2015-11-091-2/+2
| | | | |
* | | | | Added Sherlock, a custom profiling tool for GitLabYorick Peterse2015-11-092-10/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sherlock will be a new GitLab specific tool for measuring the performance of Rails requests (and SideKiq jobs at some point). Some of the things that are currently tracked: * SQL queries along with their timings, backtraces and query plans (using "EXPLAIN ANALYZE" for PostgreSQL and regular "EXPLAIN" for MySQL) * Timings of application files (including views) on a per line basis * Some meta data such as the request method, path, total duration, etc More tracking (e.g. Rugged or gitlab-shell timings) might be added in the future. Sherlock will replace any existing tools we have used so far (e.g. active_record_query_trace and rack-mini-profiler), hence the corresponding Gems have been removed from the Gemfile. Sherlock can be enabled by starting Rails as following: ENABLE_SHERLOCK=1 bundle exec rails s Recorded transactions can be found at `/sherlock/transactions`.
* | | | Enable shared runners for all new projectsKamil Trzcinski2015-11-051-4/+5
|/ / /
* | | Replace all usages of `git` command with configurable binary pathrs-git-bin-pathRobert Speicher2015-11-031-3/+3
| | | | | | | | | | | | Closes #3311
* | | Remove inflector rule that makes commits uncountableDmitriy Zaporozhets2015-11-031-21/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'shared-file-access' into 'master' Dmitriy Zaporozhets2015-10-291-1/+5
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Start putting shared files in "shared" See merge request !1691
| * | Start putting shared files in "shared"Jacob Vosmaer2015-10-261-1/+5
| |/
* | Remove the contents of the satellites dirremove-satellitesJacob Vosmaer2015-10-231-1/+3
|/
* Fixed Rubocop styling issuesYorick Peterse2015-10-151-4/+4
|
* Added rack-lineprof for developmentYorick Peterse2015-10-151-0/+31
| | | | | | | | | | | | | | This can be used to measure the time (roughly) spent on a per line basis. This can also be used to measure timings for views, for example by adding the following to a URL: ?lineprof=app/views/projects/notes/_note rack-lineprof is only enabled when: 1. The application runs in development mode 2. The used Ruby is MRI 3. The environment variable ENABLE_LINEPROF is set to a non-empty value
* Added active_record_query_traceYorick Peterse2015-10-151-0/+5
| | | | | | | This can be used to track down where queries originate from, regardless of whether they're caused by N+1 problems or not. This can be enabled by setting the environment variable ENABLE_QUERY_TRACE to a non-empty value (e.g. "true").
* Added Bullet to the GemfileYorick Peterse2015-10-151-0/+6
| | | | | | This can be used to resolve N+1 query problems. Bullet is disabled by default and can be enabled by starting Rails with the environment variable ENABLE_BULLET set to a non empty value (e.g. "true").
* Shut up, RubocopRobert Speicher2015-10-141-1/+1
| | | | [ci skip]
* Add defaults for incoming_email ssl and start_tls.incoming-email-configDouwe Maan2015-10-141-4/+6
|
View Lorry Controller Status