Commit Graph

342 Commits

Author SHA1 Message Date
Mohamed Karray
8aaea44f1a use relative path for repository directory 2018-11-22 07:05:17 +01:00
Mohamed Karray
39e5c19251 merge 2018-11-15 11:28:33 +01:00
Mohamed Karray
f8ae7cedf7 Refactor the repository store implementation in order to store repositories in specific paths. 2018-11-15 10:04:16 +01:00
René Pfeuffer
96c2114e53 Reduce SecurityFilter to user injection and enable SecurityInterceptor
Remove all the unnecessary stuff and all endpoints that would be no
longer secure.
2018-11-09 16:06:31 +01:00
René Pfeuffer
232e4fc072 Delete wrong throws JavaDoc declarations 2018-11-08 17:01:57 +01:00
René Pfeuffer
78da8c743f Put repository in git context to create proper exceptions 2018-11-08 16:42:45 +01:00
Sebastian Sdorra
cf519a7545 Merged in feature/merge_api (pull request #106)
Feature merge api
2018-11-08 15:08:07 +00:00
René Pfeuffer
6bddf9951f Make commit message configurable 2018-11-08 14:59:00 +01:00
René Pfeuffer
97d158ab35 Naming 2018-11-08 14:39:30 +01:00
René Pfeuffer
8d057f7745 Hide details 2018-11-08 14:37:18 +01:00
René Pfeuffer
720862296e Use logged in user for author as default 2018-11-08 13:30:05 +01:00
Sebastian Sdorra
2201f2436e Merged in feature/errorhandling (pull request #99)
Feature Error Handling
2018-11-08 09:36:18 +00:00
René Pfeuffer
6f7aa24700 Use jav nio to create temp directory 2018-11-08 10:00:21 +01:00
René Pfeuffer
5ca8d4d049 Extract methods to emphasize flow 2018-11-08 09:53:35 +01:00
René Pfeuffer
0714d5f960 Extract methods to emphasize flow 2018-11-08 09:32:43 +01:00
René Pfeuffer
1037d8d266 Merge with 2.0.0-m3 2018-11-08 09:21:41 +01:00
Sebastian Sdorra
c59ba9e149 Merged in feature/log_two_revisions (pull request #104)
Feature log two revisions
2018-11-07 14:07:50 +00:00
Sebastian Sdorra
73c402890c Merged in feature/diff_two_revisions (pull request #101)
Feature diff between two revisions
2018-11-07 13:54:23 +00:00
René Pfeuffer
2f91531d05 Assert existence of pool directory 2018-11-07 14:04:00 +01:00
René Pfeuffer
8771f68081 Set author for merge 2018-11-07 14:02:02 +01:00
René Pfeuffer
2d04e6c2f0 Specify not mergeable files in merge result 2018-11-07 13:34:35 +01:00
René Pfeuffer
26d5e6e062 Set merge message 2018-11-07 13:17:21 +01:00
René Pfeuffer
d5da106038 Implement merge using api of class Git 2018-11-07 12:52:40 +01:00
René Pfeuffer
e377ce5988 Implement first steps for actual merge 2018-11-07 11:52:49 +01:00
René Pfeuffer
04c5d6f84a Fix deletion of temporary clone directory 2018-11-07 11:13:21 +01:00
René Pfeuffer
e2766d494a Register SimpleGitWorkdirFactory in guice context 2018-11-07 10:38:01 +01:00
René Pfeuffer
62c20b071b Fix reminders of dry run 2018-11-07 10:33:47 +01:00
René Pfeuffer
33642352ea Start with a simple factory instead of a complex pool 2018-11-07 10:28:27 +01:00
René Pfeuffer
fc3e08d612 Include dry run in merge command 2018-11-07 08:32:27 +01:00
René Pfeuffer
6863337faf Implement first steps for merge 2018-11-06 17:14:27 +01:00
René Pfeuffer
e0cc99a3d8 Implement simple merge dry run 2018-11-06 14:40:55 +01:00
René Pfeuffer
8be8c19a26 Implement diff between two changesets for git 2018-11-06 12:04:33 +01:00
René Pfeuffer
cf05235dfa Add context to InternalRepositoryException 2018-11-06 09:14:20 +01:00
Sebastian Sdorra
dd95c9c306 implemented git repository type configuration 2018-11-06 07:59:34 +01:00
René Pfeuffer
2508a1b9b7 Implement log between two changesets for git 2018-11-05 16:42:20 +01:00
René Pfeuffer
6eb3c38655 Create error response for already existing entities 2018-10-25 15:31:42 +02:00
René Pfeuffer
f041b4ecb6 Merge with 2.0.0-m3 2018-10-25 10:15:32 +02:00
René Pfeuffer
b74fb814b8 Introduce default error object with context for not found exceptions 2018-10-18 13:12:16 +02:00
René Pfeuffer
8c46a7f714 Name things 2018-10-17 08:05:29 +02:00
René Pfeuffer
e296812457 Remove pseudo error handling 2018-10-10 18:54:15 +02:00
René Pfeuffer
fa0f66caf1 Iterate into correct subdirectory for git browse command 2018-10-10 13:27:57 +02:00
René Pfeuffer
63669b67f0 Detect browse command for root dir correctly in git 2018-10-10 11:49:49 +02:00
René Pfeuffer
0bd9ccd3d5 Do not filter for path '/'
Otherwise jgit's PathFilter will fail.
2018-10-10 09:30:52 +02:00
René Pfeuffer
83640b9d44 Merge with 2.0.0-m3 2018-10-10 08:54:23 +02:00
Sebastian Sdorra
e71e875e4d Merged in feature/harmonize_branches_in_changesets (pull request #81)
Add branch to changeset collections
2018-10-09 09:10:20 +00:00
Sebastian Sdorra
768309cea4 use develop branch instead of default 2018-10-09 08:52:33 +02:00
Sebastian Sdorra
8de89928b3 remove unused imports 2018-10-09 08:50:20 +02:00
Sebastian Sdorra
ed9f5fc69e implement new browse api for git 2018-10-08 14:39:11 +02:00
René Pfeuffer
de6b94fa4c Remove code duplication 2018-10-02 13:44:22 +02:00
René Pfeuffer
5a1f15b8c8 Fix usage of default branch 2018-10-02 13:41:20 +02:00