home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,413 Commits 48 Branches 340 Tags
2fa560d658ec7c49df97daadae443568bc72bdce
Commit Graph
477 Commits
Author SHA1 Message Date
Maël Valais a9e409179b Create cross-reference for closing references on commits pushed to non-default branches. 
I also revamped the tests on "closing reference commits" (= "Fixes #xxxx" for example).
Now, there are two different contexts:
- when the commits with "closing reference" are pushed to the default branch,
- when the commits with "closing reference" are pushed to a non-default branch.

Closes gitlab-org/gitlab-ce#2190.
 2015-08-22 16:49:09 +02:00
Robert Speicher f0bdf7f810 Merge branch 'reply-by-email' into 'master' 
Reply by email

Fixes #1360.

It's far from done, but _it works_.

See merge request !1173
 2015-08-22 00:00:08 +00:00
Douwe Maan 414533ca48 Check permissions on target project in merge request create service. 2015-08-21 09:47:39 -07:00
Douwe Maan 3d51a6d435 Merge branch 'master' into reply-by-email 2015-08-20 12:19:19 -07:00
Douwe Maan ee1eb2948d Turn reply-by-email attachments into uploads. 2015-08-19 10:18:05 -07:00
Dmitriy Zaporozhets a608e45e6b Remove unnecessary file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-14 17:56:36 +02:00
Dmitriy Zaporozhets 9ea37cda3f merge with support of pre-receive and post-receive hooks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-14 17:52:49 +02:00
Dmitriy Zaporozhets f4149bcddc Refactor how repository makes commit with pre/post receive hooks 2015-08-14 16:23:40 +02:00
Dmitriy Zaporozhets 4e4866f255 Refactor pre/post receive commit services into one class 2015-08-14 16:04:17 +02:00
Dmitriy Zaporozhets bacad39ef9 Make sure target has not changed during pre-receive hook 2015-08-14 15:22:48 +02:00
Dmitriy Zaporozhets c8614cbbe7 Capture pre-receive exception 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-13 14:29:13 +02:00
Dmitriy Zaporozhets 34690142bf Implement commit transaction with pre-receive and post-receive hooks for web editor 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-13 12:57:24 +02:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9d029a05f1 Revert "Merge branch 'web-editor-rugged' into 'master'" 
This reverts commit 5a1aa49b55, reversing
changes made to a675bea2c1.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 13:04:38 +02:00
Dmitriy Zaporozhets 9bc512314a Revert "Create and edit files in web editor via rugged" 
This reverts commit 734a4ba87d.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 11:52:33 +02:00
Dmitriy Zaporozhets 0806605962 Revert "Fix adding new file to empty repo" 
This reverts commit 27a158506e.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 11:51:26 +02:00
Dmitriy Zaporozhets 815e678c4e Revert "Use rugged in web editor for base64 encoding" 
This reverts commit 541133197b.
 2015-08-11 11:50:48 +02:00
Dmitriy Zaporozhets 34975f0180 Revert "Create activity event and execute hooks on web editor commit" 
This reverts commit 3d416f1682.
 2015-08-11 11:50:43 +02:00
Dmitriy Zaporozhets 24332b7b99 Revert "Make web editor work correctly after switch from satellites" 
This reverts commit 435f680b89.
 2015-08-11 11:49:29 +02:00
Dmitriy Zaporozhets d4cfa0bf76 Revert "Refactor web editor" 
This reverts commit dfccb06dda.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 11:49:09 +02:00
Dmitriy Zaporozhets 3b02ad8467 Revert "Merge branches inside one repository using rugged instead of satellites" 
This reverts commit d24c40ec21.
 2015-08-11 10:50:39 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets 59e7b7a654 Refactor Trigger post-receive hooks after commits are made by GitLab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 13:15:36 +02:00
Dmitriy Zaporozhets 99585a738c Trigger post-receive hoooks when commits are made by GitLab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 10:54:42 +02:00
Robert Speicher a71bed53e0 Merge branch 'merge-notifs' into 'master' 
See merge request !1077
 2015-08-07 18:47:02 -04:00
Douwe Maan 8b6ae0104d Merge branch 'master' into comment-updated-by 2015-08-06 12:52:26 +02:00
Douwe Maan 4f24eb2aa6 Merge branch 'master' into merge-notifs 2015-08-06 12:16:36 +02:00
Dmitriy Zaporozhets ab8c71de4e Fix merge request creation without branch selected 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-05 11:03:41 +02:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Douwe Maan d9e26ca6d2 Reset correct event cache 2015-07-31 14:29:18 +02:00
Douwe Maan fa9004c78c Send notification to all participants when MR is merged. 2015-07-30 15:29:43 +02:00
Douwe Maan 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +02:00
Valery Sizov e1cdc26e48 Merge branch 'rs-dev-issue-306' into 'master' 
Create project services on Project creation

Closes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/306#note_53354

See merge request !1045
 2015-07-27 07:36:14 +00:00
Robert Speicher 88aed40962 Create project services on Project creation 2015-07-25 16:43:55 -04:00
Robert Speicher b9b2d08638 Dynamically check :admin_* ability in IssuableBaseService 
Closes #2092
 2015-07-24 15:50:12 -04:00
Douwe Maan 0484ae7e6a Return true/false from AutoMergeService#merge! 2015-07-23 13:10:32 +02:00
Douwe Maan 276ca427ea Fix Remove source-branch for MRs from same project 2015-07-22 14:07:41 +02:00
Dmitriy Zaporozhets f0116f1335 Store commit count in project table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-17 15:22:56 +02:00
Dmitriy Zaporozhets 67ca5a53f6 Build missing cache items in background job after each push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-17 14:50:03 +02:00
Dmitriy Zaporozhets 989329c9d9 Fix refresh service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 16:34:58 +02:00
Dmitriy Zaporozhets a7fded9b95 Huge refactoring for accepting merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 16:03:07 +02:00
Dmitriy Zaporozhets 26f5d6047d Refactor compare and fetch logic 2015-07-15 17:28:09 +02:00
Dmitriy Zaporozhets 2a6f522cac Implement merge from forks without satellites 2015-07-15 16:45:50 +02:00
Dmitriy Zaporozhets a87989fb7d Remove satellites 2015-07-15 15:45:57 +02:00
Dmitriy Zaporozhets 277f311f20 Fetch reference from fork repo when create merge request 2015-07-15 15:27:14 +02:00
Robert Speicher f3d4767d0c Rename notice_added_references to create_new_cross_references! 2015-07-13 21:31:16 -04:00
Douwe MaanandRobert Speicher b93053695a Fix transferring of project to another group using the API. 2015-07-11 16:47:33 -04:00
Robert Speicher 8a148793af Simplify Issue and MergeRequest UpdateServices 
Now that those pesky task states are gone, these become a lot simpler.
 2015-07-08 18:00:42 -04:00
Robert Speicher 0e5fbb29f4 Remove unused task_[un]check states from Update services 
These were left over from the old Task handling.
 2015-07-08 17:56:56 -04:00
Valery Sizov 411829fdb5 Audit log for user authentication 2015-07-06 12:36:08 +03:00