home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,141 Commits 48 Branches 340 Tags
bdb4945dcf3c899c6a88fd42657a1b3f04baced1
Commit Graph
272 Commits
Author SHA1 Message Date
Douwe Maan 6368717852 Merge branch 'issue_1156' 2015-12-07 12:07:22 +01:00
Anton Baklanov caa6851bf5 Fixed duplicated issue note email notifications. 
Fixes #2560
 2015-12-06 01:20:42 +02:00
Rubén Dávila 5e6a5270d5 Raise the exception from #execute instead of #run_hook. #1156 #3069 2015-12-03 09:39:15 -05:00
Rubén Dávila 338eb2c41e Call update hook from new GitHooksService class. #3069 2015-12-03 09:39:15 -05:00
Rubén Dávila 5145706c82 Run custom Git hooks when creating or deleting branches through the UI. #1156 2015-12-03 09:39:15 -05:00
Valery Sizov f1504e1ad5 test fix 2015-11-30 18:03:07 +02:00
Valery Sizov 461731f076 fix notification_service specs 2015-11-30 11:21:10 +02:00
Robert Schilling e4f3d05c74 Add tests for (Create|Update)ReleaseService 2015-11-23 18:35:16 +01:00
Rubén Dávila 976cebe456 Little fix for Rubocop's complaints. #2296 2015-11-20 14:27:31 -05:00
Rubén Dávila 3aabed3456 Fix bug that happened when replacing the Task list. #2296 
REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/2296#note_2724697
 2015-11-20 13:58:45 -05:00
Ruben DavilaandRubén Dávila 97afb84b31 Generate system note after Task item has been updated on Issue or Merge Request. #2296 
Everytime the User check or uncheck a Task Item from the Issue or
Merge Request description, a new update is going to be
added to the activity logs of the Issue or Merge Request.

Note that when using the edit form, you can only update the Task item
status or add/delete/modify existing ones. Doing both actions is not
fully supported.
 2015-11-19 21:05:44 -05:00
Kamil Trzciński 0383f84d88 Merge branch 'ci-yaml-validation' into 'master' 
Commits without .gitlab-ci.yml are marked as skipped

- Commits without .gitlab-ci.yml are marked as skipped
- Save detailed error when YAML syntax

This also fixes: #3521 #3546 

/cc @jacobvosmaer 


See merge request !1827
 2015-11-19 22:57:06 +00:00
Valery Sizov 22bbb379ae fox tests 2015-11-19 23:00:30 +02:00
Kamil Trzcinski a5b10196e6 Fix tests 2015-11-19 15:56:03 +01:00
Valery Sizov 671a49cfd5 added specs 2015-11-19 14:41:05 +02:00
Kamil Trzcinski 0df7a32ea5 Fix tests 2015-11-19 12:09:34 +01:00
Kamil Trzcinski 2b907f61ff Commits without .gitlab-ci.yml are marked as skipped 
- Save detailed error when YAML syntax
 2015-11-19 12:09:34 +01:00
Douwe Maan d0ec28827d Fix specs 2015-11-18 12:02:09 +01:00
Douwe Maan 931c56f822 Add tests for merge request update. 2015-11-17 16:53:15 +01:00
Douwe Maan 80a2eb5d50 Fix spec 2015-11-17 16:51:39 +01:00
Douwe Maan 1ca550823b Merge branch 'master' into adamliesko/gitlab-ce-notification-upon-unassignment 2015-11-17 16:41:42 +01:00
Dmitriy Zaporozhets 8a03cb8744 Lets add more tests to Milestones services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:39:19 +01:00
Dmitriy Zaporozhets 98d6d491b5 Move global milestone specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:38:34 +01:00
Kamil Trzcinski e53a56acea Fix broken tests 2015-11-13 10:52:50 +01:00
Kamil Trzcinski 6384c757b7 Expose CI enable option in project features 
- Enable CI by default for all new projects
 2015-11-13 10:52:50 +01:00
adamliesko 798873ca75 Add notification to the former assignee upon unassignment 2015-11-09 17:26:01 +01:00
Douwe Maan 03b12ee550 Merge branch 'fix-commits-manual-merge' into 'master' 
Fix bug where manually merged branches in a MR would end up with an empty diff

This bug manifested in 8.1 with the refactoring of `RefreshService`. Here's what happens:

1. User create a new branch `foo`.
2. User creates a merge request for `foo`.
3. User merges `foo` into `master` by hand.
4. `RefreshService` reloads the merge request. Since `master` is equivalent to `foo`, this results in an empty diff.
5. `RefreshService` then closes the MR.

This wasn't an issue when you use the normal "Accept Merge Request" flow because the act of clicking the button closes the merge request, so step 4 never happens.

Closes #3314

See merge request !1758
 2015-11-09 11:12:42 +00:00
Kamil Trzcinski 4fda9ef8a5 Fix tests 2015-11-08 23:55:47 +01:00
Stan Hu 8f2561b193 Add spec for manual merge of merge request 2015-11-06 10:48:25 -08:00
Kamil Trzcinski 271ad4e354 Fix CI badge 
The previous code relied on having on ref stored in commit, however the ref was moved to the build.
 2015-10-26 12:23:40 +01:00
Jacob Vosmaer e1fff018d7 Clear archive cache asynchronously 2015-10-20 16:53:37 +02:00
Stan Hu f726df26c2 Reorder system note verb to say "Restored source branch X" instead of "Source branch X restored" 2015-10-16 00:51:25 -07:00
Stan Hu 888c1a3fc5 Add spec for refresh service adding notes to restored branches 2015-10-16 00:33:58 -07:00
Stan Hu effa94bb87 Improve SystemNote interface for branch add/restore case 2015-10-15 23:54:13 -07:00
Stan Hu 2611d9f63c Add a system note and update relevant merge requests when a branch is deleted or re-added 
If a branch is deleted with an open merge request, amended offline, and then pushed again,
GitLab doesn't bother to update the merge request even though the last commit ID and/or
code may have changed. This MR ensures that each push will update any relevant merge
requests and adds a system note if this happens as well.

Closes #2926
 2015-10-15 23:54:13 -07:00
Douwe Maan c993481d99 Merge branch 'master' into git-archive-golang 2015-10-15 11:47:36 +02:00
Robert Speicher 123669a551 Merge branch 'simplify-cross-references' into 'master' 
Simplify code around (cross)-references

See merge request !1568
 2015-10-14 20:10:34 +00:00
Valery Sizov 8f584d5f2c Fix: Images cannot show when projects' path was changed 2015-10-14 18:50:35 +03:00
Jacob Vosmaer 8f14332625 Remove RepositoryArchiveWorker specs 
These tasks have shifted to gitlab_git and gitlab-git-http-server.
 2015-10-14 12:19:02 +02:00
Robert Speicher 530f0d71f5 Shut up, Rubocop 2015-10-14 01:07:58 -04:00
Douwe Maan 127f288afb Use to_reference where possible. 2015-10-13 09:37:42 +00:00
Douwe Maan b0164771ec Simplify code around (cross)-references 2015-10-12 11:54:46 +02:00
Stan Hu c789452134 Merge branch 'XenGi/gitlab-ce-master' 2015-10-08 03:41:07 -07:00
Kamil Trzcinski 97a11136d3 Fix create_trigger_request_service_spec 2015-10-05 17:06:31 +02:00
Kamil Trzcinski 29a7c6796e Fix GitLabCiService and remove ci_yaml_file from CI push data 2015-10-05 16:06:35 +02:00
Kamil Trzcinski fb12b81b42 Make rubocop happy 2015-10-05 14:39:56 +02:00
Kamil Trzcinski 782c8f9aa0 Fix triggers spec 2015-10-05 13:37:50 +02:00
Kamil Trzcinski d2d2df0738 Fix next round of tests 2015-10-05 13:12:00 +02:00
Ricardo BandandRicardo (XenGi) Band 42be5ee1cd hooks: Add full project namespace to payload 
Payload of "project_member, :create" and "project_member, :destroy" now also
have a field project_path_with_namespace.
 2015-10-02 19:44:33 +02:00
Dmitriy Zaporozhets 3515cb9b2d Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-02 11:02:05 +02:00