summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/gb/remove-gitlab-ci-module' into 'master' Kamil Trzciński2017-02-171-8/+0
|\
| * 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
|\ \
| * | 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
|/
* 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 Sidekiqremove-sidekiq-backup-ar-threadsYorick Peterse2017-02-061-3/+1
* | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-062-0/+40
|\ \ | |/
| * Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-032-2/+2
| |\
| * | 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
| * | Don't require lib/gitlab/request_profiler/middleware.rb in config/initializer...20452-remove-require-from-request_profiler-initializerRémy Coutable2017-02-021-2/+0
| |/
* | 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
|/
* Merge branch '27280-fix-unititalized-constant' into 'master' Robert Speicher2017-01-272-13/+1
|\
| * Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/27280-fix-unititalized-constantRémy Coutable2017-01-271-6/+0
| * Move a begin/rescue clause to ApplicationSetting.expireRémy Coutable2017-01-271-7/+1
* | Add the rspec_profiling gem and documentation to the GitLab development envir...23034-enable-rspec-profilingNick Thomas2017-01-271-0/+14
|/
* Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-251-0/+9
|\
| * Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-251-0/+9
* | Add metric initializer specadd-metrics-initializer-specSean McGivern2017-01-241-104/+115
|/
* 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 statisticsMarkus Koller2016-12-211-1/+1
* | 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
* Gogs ImporterKim "BKC" Carlbäcker2016-12-191-1/+1
* Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-171-1/+1
|\
| * 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
| * Merge branch 'katex-math' into 'master' Sean McGivern2016-12-151-0/+2
| |\
| | * Render math in Asciidoc and Markdown with KaTeX using code blocksMunken2016-12-141-0/+2
| * | Add Gitlab::Middleware::MultipartJacob Vosmaer2016-12-151-0/+3
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-144-3/+20
|\ \ \ | |/ /
| * | Crontab typo '* */6' -> '0 */6' (4x/day not 1x-per-min-for-1h 4x/day)Jon Bailey2016-12-121-1/+1