Commit graph

482 commits

Author SHA1 Message Date
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
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