config/routes · 635d5bf2a2ab1fec52cdf94821b3b89adeeab38d · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

History Find file

Merge branch 'master' into 'issue_38337' · e77c4e9e
Felipe Artur authored Mar 06, 2018
```
# Conflicts:
#   app/models/group.rb
#   db/schema.rb
```
e77c4e9e

Name	Last commit	Last update
..
admin.rb		Loading commit data...
api.rb		Loading commit data...
ci.rb		Loading commit data...
dashboard.rb		Loading commit data...
development.rb		Loading commit data...
explore.rb		Loading commit data...
git_http.rb		Loading commit data...
google_api.rb		Loading commit data...
group.rb		Loading commit data...
help.rb		Loading commit data...
import.rb		Loading commit data...
legacy_builds.rb		Loading commit data...
profile.rb		Loading commit data...
project.rb		Loading commit data...
repository.rb		Loading commit data...
sherlock.rb		Loading commit data...
sidekiq.rb		Loading commit data...
snippets.rb		Loading commit data...
uploads.rb		Loading commit data...
user.rb		Loading commit data...
wiki.rb		Loading commit data...