Commit 78ba3be1 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch '431-remove-rails4-rails5-specific-code' into 'master'

Remove rails4/rails5 specific code

Closes #431

See merge request !566
parents 87f2edad d2ffbc4c
Pipeline #42136394 failed with stages
in 5 minutes and 6 seconds
......@@ -22,13 +22,11 @@ postgresql: exec support/postgresql-signal-wrapper postgres -D /home/git/postgre
gitaly: exec gitaly/bin/gitaly /home/git/gitaly/config.toml
gitlab-workhorse: exec /usr/bin/env PATH="/home/git/gitlab-workhorse/bin:$PATH" gitlab-workhorse -authSocket /home/git/gitlab.socket -listenAddr $host:$port -documentRoot /home/git/gitlab/public -developmentMode -secretPath /home/git/gitlab/.gitlab_workhorse_secret -config /home/git/gitlab-workhorse/config.toml
rails-background-jobs: exec /usr/bin/env SIDEKIQ_LOG_ARGUMENTS=1 RAILS_ENV=development RAILS_RELATIVE_URL_ROOT=$relative_url_root support/exec-cd gitlab bin/background_jobs start_foreground
rails5-background-jobs: exec /usr/bin/env BUNDLE_GEMFILE=Gemfile.rails5 RAILS5=1 SIDEKIQ_LOG_ARGUMENTS=1 RAILS_ENV=development RAILS_RELATIVE_URL_ROOT=$relative_url_root support/exec-cd gitlab bin/background_jobs start_foreground
# Frontend services
#
webpack: exec /usr/bin/env NODE_ENV=development DEV_SERVER_PORT=3808 support/exec-cd gitlab yarn dev-server
rails-web: exec /usr/bin/env RAILS_ENV=development RAILS_RELATIVE_URL_ROOT=$relative_url_root support/exec-cd gitlab bin/web start_foreground
rails5-web: exec /usr/bin/env BUNDLE_GEMFILE=Gemfile.rails5 RAILS5=1 RAILS_ENV=development RAILS_RELATIVE_URL_ROOT=$relative_url_root support/exec-cd gitlab bin/web start_foreground
gitlab-pages: exec gitlab-pages/bin/gitlab-pages -listen-http ":3010" -pages-root /home/git/gitlab/shared/pages/ -pages-domain 127.0.0.1.xip.io
# Docker
......
......@@ -98,11 +98,7 @@ Check the [GitLab Geo instructions](./howto/geo.md).
Start GitLab and all required services:
```sh
# Rails 4 (current stable)
gdk run
# Rails 5.0 (next version, we're migrating to it now)
gdk run rails5
```
To start only the databases use:
......@@ -114,11 +110,7 @@ gdk run db
To start only the app (assuming the DBs are already running):
```sh
# Rails 4 (current stable)
gdk run app
# Rails 5.0 (next version, we're migrating to it now)
gdk run app rails5
```
To access GitLab you may now go to http://localhost:3000 in your browser. The development login credentials are `root` and `5iveL!fe`. If you followed the GitLab Enterprise Edition instructions above, you will need to access http://localhost:3001 in your browser.
......
......@@ -7,11 +7,7 @@ def main(argv)
when 'app'
svcs = %w[gitlab-workhorse nginx grafana sshd gitaly storage-check gitlab-pages]
if argv[1] == 'rails5'
foreman_exec(svcs + %w[rails5-web rails5-background-jobs], exclude: %w[rails-web rails-background-jobs])
else
foreman_exec(svcs + %w[rails-web rails-background-jobs], exclude: %w[rails5-web rails5-background-jobs])
end
foreman_exec(svcs + %w[rails-web rails-background-jobs])
when 'grafana'
foreman_exec(%w[grafana])
when 'thin'
......@@ -24,12 +20,9 @@ def main(argv)
foreman_exec(%w[gitaly])
when 'jobs'
foreman_exec(%w[rails-background-jobs])
when 'rails5'
print_url
foreman_exec(%w[all], exclude: %w[rails-web rails-background-jobs])
when nil
print_url
foreman_exec(%w[all], exclude: %w[rails5-web rails5-background-jobs])
foreman_exec(%w[all])
else
puts
puts "GitLab Development Kit does not recognize this command."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment