Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Register
  • Sign in
  • G gitlab-ce
  • 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 1
    • Merge requests 1
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • nexedinexedi
  • gitlab-ce
  • Repository
  • gitlab-ce
  • app
  • controllers
  • application_controller.rb
Find file BlameHistoryPermalink
  • Dmitriy Zaporozhets's avatar
    Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 · fae2e540
    Dmitriy Zaporozhets authored Apr 10, 2014
    
    
    Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    
    Conflicts:
    	CHANGELOG
    	Gemfile.lock
    	README.md
    	VERSION
    	app/assets/javascripts/application.js
    	db/schema.rb
    	doc/install/installation.md
    	doc/update/4.2-to-5.0.md
    	doc/update/5.0-to-5.1.md
    	doc/update/5.1-to-5.2.md
    	doc/update/5.2-to-5.3.md
    	doc/update/5.4-to-6.0.md
    	doc/update/6.0-to-6.1.md
    	doc/update/6.0-to-6.7.md
    	lib/gitlab/git_access.rb
    fae2e540
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7