Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Register
  • Sign in
  • slapos slapos
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 0
    • Merge requests 0
  • Deployments
    • Deployments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • Iliya Manolov
  • slaposslapos
  • Repository
  • slapos
  • software
  • gitlab
  • template
  • gitlab.yml.erb
Find file BlameHistoryPermalink
  • Kirill Smelkov's avatar
    gitlab: Import gitlab-ce & gitlab-shell configs from omnibus-gitlab · 6fd7b987
    Kirill Smelkov authored Jan 07, 2016
    Pristine import of template configuration files from omnibus GitLab
    package. All files were imported as-is in their ERB form and filenames
    from omnibus-gitlab 8.2.3+ce.0-0-g8eda093 from here:
    
        https://gitlab.com/gitlab-org/omnibus-gitlab/tree/8eda093/files/gitlab-cookbooks/gitlab/templates/default
    
    We will convert the templates to jinja2 and adjust them to slapos
    version in the following patches.
    
    Scheme for synchronizing with future upstream changes is envisioned as this:
    
        - checkout latest commit which updated pristine erb files
        - copy updated files from omnibus-gitlab, and commit the updates
        - checkout slapos master
        - merge commit that updated erb
    
    That should reasonably work with not too-many conflicts and even those
    should be not hard to resolve (with `git mergetool` e.g. in kdiff3)
    
    /cc @kazuhiko, @jerome
    6fd7b987
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7