Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add Pipeline Schedules that supersedes experimental Trigger Schedule | Zeger-Jan van de Weg | 2017-05-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'mrchrisw-import-shell-timeout' | Sean McGivern | 2017-05-05 | 1 | -0/+3 |
|\ | |||||
| * | Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeout | Chris Wilson | 2017-04-27 | 1 | -0/+3 |
| | | | | | | | | | | | | | | GitLab uses the import_project method in GitLab Shell, This method uses a timeout for the operation, hardcoded to 800 seconds. With this MR the timeout is now configurable in the gitlab_shell settings. | ||||
* | | Make location of gitlab_workhorse_secret configurable | Jakub Jirutka | 2017-04-19 | 1 | -0/+5 |
|/ | | | | | | Hard-coding location of configuration files is very bad practice. This patch applies the same approach as currently used for gitlab_shell_secret file. | ||||
* | Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testing | Alejandro Rodríguez | 2017-04-11 | 1 | -2/+2 |
| | |||||
* | Change configuration in gitlab.com as trigger_schedule_worker will perform ↵ | Shinya Maeda | 2017-04-06 | 1 | -1/+1 |
| | | | | twice a day | ||||
* | Rename ScheduledTrigger to TriggerSchedule. Because table structure changed. | Shinya Maeda | 2017-04-06 | 1 | -1/+1 |
| | |||||
* | Add config for worker | Shinya Maeda | 2017-04-06 | 1 | -0/+3 |
| | |||||
* | Add support for Gitaly calls over TCP connectionfeature/support-grpc-calls-over-tcp-conn | Ahmad Sherif | 2017-04-03 | 1 | -1/+1 |
| | | | | Closes gitaly#166 | ||||
* | Merge branch '29843-project-subgroup-transfer' into 'security' | Rémy Coutable | 2017-03-29 | 1 | -0/+2 |
| | | | | | | Use full path for moving directories when changing namespace path See merge request !2078 | ||||
* | Change socket_path to gitaly_address | Jacob Vosmaer | 2017-03-29 | 1 | -8/+8 |
| | |||||
* | Add gitaly source installation instructions | Jacob Vosmaer | 2017-03-21 | 1 | -1/+1 |
| | |||||
* | Merge branch 'pages-multiple-ips-doc' into 'master' | Kamil Trzciński | 2017-03-16 | 1 | -2/+2 |
|\ | | | | | | | | | The GitLab Pages external-http and external-https arguments can be specified multiple times See merge request !9812 | ||||
| * | The GitLab Pages external-http and external-https arguments can be specified ↵ | Nick Thomas | 2017-03-08 | 1 | -2/+2 |
| | | | | | | | | multiple times | ||||
* | | Remove unused satellites config | Stan Hu | 2017-03-13 | 1 | -10/+0 |
| | | | | | | | | | | Note that the old migrations depend on 1_settings.rb, so we can't quite remove those completely. | ||||
* | | Merge branch 'enable-snippets-by-default' into 'master' | Douwe Maan | 2017-03-10 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Enable snippets for new projects by default Closes #28192 See merge request !9857 | ||||
| * | | Enable snippets for new projects by defaultenable-snippets-by-default | Sean McGivern | 2017-03-10 | 1 | -1/+1 |
| |/ | | | | | | | | | If there is an existing gitlab.yml file with snippets explicitly disabled, they won't be enabled with this change. | ||||
* | | Document gitaly.socket_path setting | Jacob Vosmaer | 2017-03-10 | 1 | -0/+10 |
|/ | |||||
* | Merge branch '28447-hybrid-repository-storages' into 'master' | Sean McGivern | 2017-03-07 | 1 | -2/+4 |
|\ | | | | | | | | | Update storage settings to allow extra values per shard See merge request !9597 | ||||
| * | Update storage settings to allow extra values per shard28447-hybrid-repository-storages | Alejandro Rodríguez | 2017-03-03 | 1 | -2/+4 |
| | | | | | | | | | | | | | | This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility | ||||
* | | Merge branch '24998-fix-typo-gitlab-config-file' into 'master' | Rémy Coutable | 2017-03-06 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix typo in Gitlab application config file Closes #24998 See merge request !9702 | ||||
| * | | Fix typo in Gitlab application config file | medied | 2017-03-04 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'backup_storage_class' into 'master' | Rémy Coutable | 2017-03-06 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | Add storage class configuration option for Amazon S3 remote backups See merge request !9599 | ||||
| * | | Add storage class configuration option for Amazon S3 remote backups | Jon Keys | 2017-02-28 | 1 | -0/+2 |
| |/ | |||||
* | | Renable StuckCiBuildsWorker to StucjCiJobsWorker27523-make-stuck-build-detection-more-performant | Tomasz Maczukin | 2017-03-03 | 1 | -2/+2 |
| | | |||||
* | | Update default configuration of stuck_ci_builds_worker cron interval | Tomasz Maczukin | 2017-03-01 | 1 | -1/+1 |
|/ | |||||
* | Remove all instances of theme_id; require downtime | Annabel Dunstone Gray | 2017-02-15 | 1 | -1/+1 |
| | |||||
* | Drop theme ID from users table | Annabel Dunstone Gray | 2017-02-15 | 1 | -8/+0 |
| | |||||
* | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce | James Edwards-Jones | 2017-02-06 | 1 | -0/+10 |
|\ | | | | | | | # Conflicts: # db/schema.rb | ||||
| * | add rack middleware to proxy webpack dev server | Mike Greiling | 2017-02-01 | 1 | -0/+10 |
| | | |||||
* | | Final fixes | Kamil Trzcinski | 2017-01-31 | 1 | -2/+2 |
| | | |||||
* | | Implement extra domains and save pages configuration | Kamil Trzcinski | 2017-01-31 | 1 | -0/+2 |
| | | |||||
* | | Change pages domain to host | Kamil Trzcinski | 2017-01-31 | 1 | -1/+1 |
| | | |||||
* | | Support https and custom port for pages | Kamil Trzcinski | 2017-01-31 | 1 | -0/+2 |
| | | |||||
* | | Add GitLab Pages | Kamil Trzcinski | 2017-01-31 | 1 | -0/+11 |
|/ | | | | | | | | | | | | | | | | - 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 'zj-mattermost-slash-config' into 'master' | Kamil Trzciński | 2016-12-21 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Mattermost slash auto config Closes #24769 See merge request !8070 | ||||
| * | Merge branch 'master' into 'zj-mattermost-slash-config' | Zeger-Jan van de Weg | 2016-12-18 | 1 | -3/+4 |
| |\ | | | | | | | | | | | | | | | | # Conflicts: # config/gitlab.yml.example # lib/mattermost/session.rb # spec/lib/mattermost/session_spec.rb | ||||
| * | | Base work for auto config MM slash commands | Z.J. van de Weg | 2016-12-16 | 1 | -0/+5 |
| | | | |||||
* | | | Added support for Authentiq oauth provider | Alex | 2016-12-21 | 1 | -0/+10 |
| |/ |/| | |||||
* | | Store mattermost_url in settings | Kamil Trzcinski | 2016-12-17 | 1 | -0/+6 |
|/ | |||||
* | Add idle_timeout to reply by email doc. | Marin Jankovski | 2016-11-16 | 1 | -1/+1 |
| | |||||
* | Make mail_room idle_timeout option configurable. | Marin Jankovski | 2016-11-16 | 1 | -0/+2 |
| | |||||
* | Update gitlab.yml.example | Elan Ruusamäe | 2016-11-02 | 1 | -1/+3 |
| | |||||
* | Finish updates to use JIRA gem | Felipe Artur | 2016-10-26 | 1 | -0/+4 |
| | | | | Code improvements, bug fixes, finish documentation and specs | ||||
* | Merge branch 'docs/refactor-reply-by-email' into 'master' | Achilleas Pipinellis | 2016-10-11 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move reply by email docs to a new location ## What does this MR do? Move reply by email docs to a new location. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/3349 ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [ ] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [ ] Make sure internal links pointing to the document in question are not broken. - [ ] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [ ] If working on CE, submit an MR to EE with the changes as well. See merge request !6517 | ||||
| * | Move reply by email docs to a new locationdocs/refactor-reply-by-email | Achilleas Pipinellis | 2016-09-25 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
* | | add configurable email subject suffix | Fu Xu | 2016-10-03 | 1 | -0/+1 |
|/ | |||||
* | Update default path for repository_downloads_path in gitlab.yml.example | Douglas Barbosa Alexandre | 2016-07-21 | 1 | -2/+2 |
| | |||||
* | Refactor repository paths handling to allow multiple git mount points | Alejandro Rodríguez | 2016-06-29 | 1 | -4/+10 |
| | |||||
* | Move keep to ArtifactsController | Kamil Trzcinski | 2016-06-13 | 1 | -2/+2 |
| |