Shane Kilkelly
b1d7a0cf63
Merge pull request #65 from overleaf/sk-handle-409-has-dot-git
...
Handle a 409 response with code=projectHasDotGit
2019-05-29 10:33:22 +01:00
Shane Kilkelly
b6fc48645a
Merge pull request #64 from overleaf/sk-skip-failing-projects-in-swap-job
...
Skip failing projects in swap job, and give up after a certain number
2019-05-29 10:33:06 +01:00
Shane Kilkelly
719f0c3661
Give up on projects that cannot be swapped, rather than spinning the loop forever
2019-05-29 10:20:37 +01:00
Shane Kilkelly
2492c95c0b
Handle a 409 response with code=projectHasDotGit
2019-05-29 10:18:49 +01:00
Shane Kilkelly
f237efa6d5
Log and trap/ignore gc errors during swap
2019-05-23 11:14:02 +01:00
Shane Kilkelly
c7d8c1c6b5
Run GC on a project at start of swap job.
...
When there is an exception during swap, add project name to log
2019-05-16 11:42:13 +01:00
Simon Detheridge
d51f2fecfc
Allow colons in passwords
...
bug: overleaf/issues#1393
2019-05-16 10:03:27 +01:00
Jakob Ackermann
f547b6d494
Revert "Add git, make, and curl to docker image"
...
This reverts commit 02a2c9cd429b26ff44fabb97d3649e791b9edea4
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-05-05 18:34:01 +02:00
Jakob Ackermann
5907172463
Merge remote-tracking branch 'upstream/master' into misc/docker-build
...
# Conflicts:
# Dockerfile
2019-05-05 18:32:35 +02:00
Jakob Ackermann
35ac848f43
[docker] install git in the app image
...
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-26 23:59:59 +02:00
Jakob Ackermann
a333aabfa9
[WLGitBridgeIntegrationTest] adjust the urls for the individual tests
...
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-26 23:56:54 +02:00
Jakob Ackermann
5040b4d7f0
[WLGitBridgeIntegrationTest] ensure that we stop the started servers
...
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-26 23:56:47 +02:00
Shane Kilkelly
c3308e565b
Add git, make, and curl to docker image
2019-04-26 15:29:44 +01:00
Jakob Ackermann
a517c15053
[docker] include the LICENSE file in the image
...
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-17 23:10:08 +02:00
Jakob Ackermann
2ebae69044
[docker] build the git-bridge in docker
...
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-17 13:45:21 +02:00
Jakob Ackermann
85a8e377fc
[docker] use a base image that already contains maven and openjdk
...
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-17 11:21:41 +02:00
Shane Kilkelly
8f72cb89c8
Reject v1 ids earlier in the pipeline
2019-03-08 11:45:31 +00:00
Shane Kilkelly
788fad5ce7
Remove a deprecated method, no longer compatible with JGit 5.2
2019-03-06 11:43:27 +00:00
Shane Kilkelly
600aa8d9cf
Do mvn clean
before build.
...
We've had build issues be hidden by caching. So we should build from
clean each time, in immitation of the prod build process.
2019-03-06 11:41:59 +00:00
Shane Kilkelly
c1e7969342
Revert "Revert "Upgrade JGit dependency to 5.2.1""
...
This reverts commit 42b5a32670e43b307ec2b0a34380e373b16be1fe.
2019-03-06 10:59:40 +00:00
Shane Kilkelly
0943248334
Revert "Upgrade JGit dependency to 5.2.1"
...
This reverts commit c0d9fb961396aa285e7ebf563b707c9fb299776c.
2019-03-06 10:31:07 +00:00
Shane Kilkelly
6d9e8d38e9
Merge pull request #53 from overleaf/sk-refuse-v1-ids
...
Refuse to process project-ids that look like they come from v1
2019-03-06 10:17:17 +00:00
Shane Kilkelly
a517035e2c
Refuse to process project-ids that look like they come from v1
2019-03-06 10:16:55 +00:00
Shane Kilkelly
845397639e
Upgrade JGit dependency to 5.2.1
2019-03-04 10:15:34 +00:00
Shane Kilkelly
0f130096a2
Increase postback timeout to six minutes, to help users posting large payloads
2019-01-15 10:52:30 +00:00
Shane Kilkelly
4dc140aced
Add integration test to cover imported-but-not-changed projects
2019-01-10 10:21:31 +00:00
Shane Kilkelly
4f1168a590
Add comments pointing to github issue
2019-01-09 14:24:04 +00:00
Shane Kilkelly
b8d252244c
Tolerate case where there is no latest version timestamp in version info
2019-01-09 12:23:26 +00:00
Shane Kilkelly
ba8ba001d6
Fetch snapshots in edge-case where version-id is zero
2019-01-09 12:23:00 +00:00
Shane Kilkelly
779778fdb1
Use newUrl
if supplied when v1 is deprecated
2019-01-08 09:47:01 +00:00
Shane Kilkelly
0d0c5458dd
Handle when v1 is deprecated, print a message instead of an error
2019-01-07 11:54:44 +00:00
Shane Kilkelly
40add6985f
Remove override of connect timeout
2018-12-17 09:39:19 +00:00
Shane Kilkelly
2195af88dd
Set timeouts on Post requests too
2018-12-14 16:34:48 +00:00
Shane Kilkelly
46904bfe73
Set timeouts on http requests to 3 minutes, up from the default of 20 seconds.
2018-12-14 16:13:58 +00:00
Shane Kilkelly
0bc82e6936
Merge pull request #46 from overleaf/sk-increase-push-timeout
...
Change push timeout to three minutes
2018-12-14 09:46:46 +00:00
Shane Kilkelly
9ee39ae930
Wrap the generic repository-missing message correctly
...
Now appears to the client as:
```
fatal: remote error: no git access
This Overleaf project currently has no git access, either because
the project does not exist, or because git access is not enabled
for the project.
```
2018-12-13 12:37:42 +00:00
Shane Kilkelly
abcaf8242e
Include message along with error description lines
2018-12-13 12:37:21 +00:00
Shane Kilkelly
a766482a00
Remove stray import
2018-12-13 12:37:09 +00:00
Shane Kilkelly
bf7be6071d
Handle GitUserException, with multiple lines of output
2018-12-13 11:41:07 +00:00
Shane Kilkelly
2f18feb136
Keep the default constructor for MissingRepositoryException
2018-12-13 11:40:08 +00:00
Shane Kilkelly
27e1152095
Fix wording of the generic-error when a repository is missing
2018-12-13 10:34:09 +00:00
Shane Kilkelly
a72146aa8d
Better report to user on push timeout
2018-12-12 10:38:26 +00:00
Shane Kilkelly
3f85dc80f4
When user clone/pull/etc a project which doesn't exist, print a nice message
...
The old behaviour was to just show an equivalent of a 500 error.
This way, we catch the 404 from the API, and print an appropriate message
to the user.
2018-12-11 12:35:21 +00:00
Shane Kilkelly
c435eccc43
Change push timeout to three minutes
2018-12-11 09:24:09 +00:00
Shane Kilkelly
d22d5829bb
Remove redundant try/catch around directory copy operation
2018-12-06 09:45:07 +00:00
Shane Kilkelly
67d365e661
Remove commas because grammer
2018-12-06 09:40:09 +00:00
Shane Kilkelly
6b8101d278
Init the new repo from existing repository, avoid creating files then deleting
2018-12-05 16:54:58 +00:00
Shane Kilkelly
8cb715014c
More concise handling of optional migratedFromId
in test
2018-12-05 15:00:00 +00:00
Shane Kilkelly
709cb0887c
Remove old constructor without the migratedFromId
param
2018-12-05 14:59:41 +00:00
Shane Kilkelly
925ebc2133
Check project state inside the lock
2018-12-05 14:58:51 +00:00
Shane Kilkelly
439d55d805
Update wording of the change-your-remote message shown to user
2018-12-05 10:42:58 +00:00
Shane Kilkelly
007dfe1420
Change new_remote
to newRemote
2018-12-04 10:43:48 +00:00
Shane Kilkelly
8005ebf5d0
Remove test exception
2018-12-04 10:14:39 +00:00
Shane Kilkelly
c0b52c5851
Add 'please' to message shown to client for migrated project
2018-12-03 11:53:34 +00:00
Shane Kilkelly
326d0a0722
When a repo has migrated to v2, print message about updating remote
2018-12-03 11:49:06 +00:00
Shane Kilkelly
c553094a60
Add a test for when migrated-from project is not present
2018-12-03 10:13:10 +00:00
Shane Kilkelly
aa267a59da
fix whitespace
2018-11-30 16:13:33 +00:00
Shane Kilkelly
267d324870
Alter the classloader workaround, and leave link to SO page describing the problem
2018-11-30 15:21:48 +00:00
Shane Kilkelly
dd2e9b6945
More closely match the semantics of projectExists
2018-11-29 11:39:56 +00:00
Shane Kilkelly
f852cd603d
Use FileUtils to handle copying of migrated repository
2018-11-29 11:39:30 +00:00
Shane Kilkelly
1a646d3fd0
Add an integration test for migrating repository
2018-11-29 10:22:22 +00:00
Shane Kilkelly
8bdf7031c5
Fix log line
2018-11-28 14:17:30 +00:00
Shane Kilkelly
245cd67a39
Fix tests
2018-11-27 16:24:50 +00:00
Shane Kilkelly
b061608124
Re-instate tests
2018-11-27 16:24:40 +00:00
Shane Kilkelly
a524bfbac1
Minor cleanup
2018-11-27 16:07:42 +00:00
Shane Kilkelly
66fa946cb8
set timestamp on new record too
2018-11-27 16:07:26 +00:00
Shane Kilkelly
4f3021cca1
Speculative solution
2018-11-27 11:35:22 +00:00
Shane Kilkelly
19075f18bc
Add migratedFromID
property to GetDocResult
2018-11-22 12:01:28 +00:00
Shane Kilkelly
51957ab78b
Update api base url
2018-11-12 11:23:04 +00:00
Shane Kilkelly
cf31ccbea0
Update to account for dev-env changes
2018-11-06 13:55:58 +00:00
Shane Kilkelly
d6c509496c
Fix postback url
2018-10-25 15:27:22 +01:00
Shane Kilkelly
ad5515953b
Add oauth-app sql to readme
2018-10-25 14:56:42 +01:00
Shane Kilkelly
b6a44fdd33
Add local conf file, for dev environment
2018-10-25 14:48:48 +01:00
Shane Kilkelly
f898f43b4e
Correct instructions for starting service
2018-10-25 11:30:17 +01:00
Shane Kilkelly
ceb8d8ad16
Update readme with instructions on how to set up with dev-env
2018-10-25 11:28:19 +01:00
Shane Kilkelly
394fd17dfa
Working docker setup
2018-10-15 11:06:18 +01:00
Shane Kilkelly
a1ac1bf17f
Fix makefile, seems to work now
2018-10-08 10:57:20 +01:00
Shane Kilkelly
9ba5517915
Add git to docker packages
2018-10-08 10:41:26 +01:00
Shane Kilkelly
33dbbe49ff
Add makefile and basic dockerfile
2018-10-08 10:36:20 +01:00
Michael Walker
b91390c025
Fix gc job leak in tests
2018-03-09 11:25:01 +00:00
Michael Walker
b5e7327410
Fix swap job leak in tests
2018-03-09 11:16:51 +00:00
Michael Walker
86f60519a1
Queue a garbage collection after generating commits
2018-03-09 11:12:54 +00:00
Michael Walker
3f1eb2b0c3
Revert "Revert "Update dependencies to latest stable versions""
2018-02-27 11:51:02 +00:00
Michael Walker
e68271747b
Revert "Update dependencies to latest stable versions"
2018-02-27 11:46:28 +00:00
Michael Walker
e81931ef35
Merge pull request #40 from overleaf/msw-delete-temp-files
...
Small code improvements around temporary files
2018-02-27 11:16:57 +00:00
Michael Walker
513e83fa00
Clean up temporary file if tarTo raises an exception
2018-02-26 16:30:08 +00:00
Michael Walker
ddc524b588
Log an error if a DeletingFileInputStream is open at finalization
2018-02-26 14:48:18 +00:00
Michael Walker
55cb41f5b2
Use DeletingFileInputStream in tar method
2018-02-26 14:19:02 +00:00
Michael Walker
a627c7e9b3
Drop use of deprecated interface
2018-02-09 16:01:05 +00:00
Michael Walker
9bb7576f0b
Replace com.ning/async-http-client with new package
...
Notice at:
https://github.com/ning/async-http-client
2018-02-09 16:00:58 +00:00
Michael Walker
7a01c054da
Replace commons-lang/commons-lang with new package
...
Notice at:
https://mvnrepository.com/artifact/commons-lang/commons-lang
2018-02-09 14:45:18 +00:00
Michael Walker
c2b8e09f58
Update dependencies
2018-02-09 14:44:41 +00:00
Michael Walker
016281df3d
Update test dependencies
2018-02-09 11:52:38 +00:00
Michael Walker
88d2a9523f
Update maven plugins
2018-02-09 11:52:32 +00:00
Michael Walker
8b32084c5b
Add links to mvnrepository for all dependencies
2018-02-09 11:47:42 +00:00
Michael Walker
c5e184f7cc
Make mockito-core a test dependency
2018-02-09 11:38:19 +00:00
Michael Walker
1ca63e1ba1
Return a generic summary from MissingRepositoryException.getMessage
2018-02-07 14:25:04 +00:00
Michael Walker
4c237e84f5
Rename disabled project test
2018-02-07 13:27:31 +00:00
Michael Walker
25ccfe28fe
Rename protected project test
2018-02-07 13:27:19 +00:00
Michael Walker
77e3bc0d3b
Remove unused constructor
2018-02-07 13:01:41 +00:00