Commit Graph
243 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets 37e9e71ea1 Remove unnecessary fork ci logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-02 10:26:56 +02:00
Dmitriy Zaporozhets 82f1921165 Merge branch 'mr_improve_errors_handling' 2015-10-01 11:28:36 +02:00
Valery Sizov 5b57313051 Note the original location of a moved project when notifying users of the move 2015-10-01 09:54:56 +03:00
Valery Sizov 05fdd12fd9 Improve error message when merging fails 2015-10-01 09:45:47 +03:00
Kamil Trzcinski b9ccc79cb5 Delegate ci_project parameters to projects
- It delegates name, path, gitlab_url, ssh_url_to_repo
- Remove ability to set this parameters using CI API

This fixes GitLab project rename, namespace change, repository rename, etc.
2015-09-30 12:48:40 +02:00
Kamil Trzcinski 0d877d91e7 Make ensure_gitlab_ci_project return ci_project or create a new one 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 2c1f7ccac8 Fix register_build_service tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 0e33814708 Fix tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 30c78e70cb WIP 2015-09-29 10:47:03 +02:00
Robert Speicher 2f88459297 Ensure raise_error expectations provide arguments 2015-09-21 15:35:29 -04:00
Kamil Trzcinski 8671343b65 Rubocop fix 2015-09-20 20:46:15 +02:00
Kamil Trzcinski 71a5d5a036 Fail builds if no .gitlab-ci.yml is found 2015-09-20 20:46:14 +02:00
Valery SizovandKamil Trzcinski a0c1a12dee remove API calls from CE to CI 2015-09-18 18:02:11 +02:00
Stan Hu f481637245 Merge branch 'fix-issue-2382' into 'master'
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity

Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone".

Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png)

Closes #2382

See merge request !1227
2015-09-17 08:04:37 +00:00
Kamil Trzcinski e21deaee8e Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
# Conflicts:
#	Gemfile.lock
2015-09-15 22:40:35 +02:00
Kamil Trzcinski 0d23676f9d Fix: rubocop 2015-09-15 22:24:33 +02:00
Kamil Trzcinski 209c72c4a1 Fix: services/ci/create_project_service_spec.rb 2015-09-15 21:53:04 +02:00
Valery Sizov b87ca7500f fix specs. Stage 7 2015-09-15 17:43:17 +03:00
Valery Sizov 88b3195ecf fix specs. Stage 6 2015-09-15 16:29:36 +03:00
Stan Hu d3d03d1362 Create a "destroyed Milestone" event and keep Milestone events around in the DB
for posterity.

Also fix issue where destroying a Milestone would cause odd, transient messages like
"created milestone" or "imported milestone".

Add "in" preposition when creating and destroying milestones

Closes #2382
2015-09-15 05:51:11 -07:00
Valery Sizov e2cbb36ba9 fix specs. Stage 5 2015-09-15 15:51:03 +03:00
Valery Sizov 2c4daf1a68 fix part of specs 2015-09-14 16:48:33 +03:00
Valery Sizov 4c53cc0eba rubocop satisfy 2015-09-14 14:37:18 +03:00
Stan Hu 9995f0806b Import forked repositories asynchronously to prevent large repositories from timing out
Use import_status to track async import status and give feedback to the user

Closes #2388
Closes #2400
2015-09-11 00:34:04 -07:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02:00
Dmitriy Zaporozhets 90c338a495 Move helpers back to original directory 2015-09-09 14:37:34 +02:00
Dmitriy Zaporozhets cc4ef4da11 Refactor CI tests 2015-09-09 14:17:16 +02:00
Dmitriy Zaporozhets b05cc8bc9a Merge branch 'global_labels' into 'master'
Global labels

https://dev.gitlab.org/gitlab/gitlabhq/issues/2353

See merge request !1240
2015-09-09 08:57:54 +00:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00