Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
subugoe
ahiqar
backend
Merge requests
!70
Something went wrong on our end
Develop
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Develop
develop
into
main
Overview
0
Commits
179
Pipelines
0
Changes
15
Merged
Michelle Weidling
requested to merge
develop
into
main
4 years ago
Overview
0
Commits
179
Pipelines
0
Changes
15
Expand
0
0
Merge request reports
Viewing commit
4df1f544
Prev
Next
Show latest version
15 files
+
54
−
67
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
15
Search (e.g. *.vue) (Ctrl+P)
4df1f544
Merge branch 'feature/
#51
-remove-sade' into 'develop'
· 4df1f544
Michelle Weidling
authored
4 years ago
Feature/
#51
remove sade Closes
#51
See merge request
!59
docker/httpd/vhosts/exist.conf
+
3
−
3
Options
@@ -17,10 +17,10 @@
ProxyPassReverse
http
://
existdb
:
8080
/
exist
/
</
Location
>
<
Location
/
sade
/ >
<
Location
/
textgrid
-
connect
/ >
ProxyPreserveHost
Off
ProxyPass
http
://
existdb
:
8080
/
exist
/
apps
/
sade
/
retry
=
0
ProxyPassReverse
http
://
existdb
:
8080
/
exist
/
apps
/
sade
/
ProxyPass
http
://
existdb
:
8080
/
exist
/
apps
/
textgrid
-
connect
/
retry
=
0
ProxyPassReverse
http
://
existdb
:
8080
/
exist
/
apps
/
textgrid
-
connect
/
</
Location
>
<
Location
/
rest
/ >
Loading