home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,431 Commits 48 Branches 340 Tags
f04c5b27f0c19dfab00a6ac2de8b4168b67fe7a0
Commit Graph
978 Commits
Author SHA1 Message Date
Rémy Coutable f73def90a8 Merge branch 'fix-ci-commit-creation' into 'master' 
Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios

## What does this MR do?

If we use a new `project.ci_commits` it will add it to array, and some other services which can do a save on a project can lead to a scenario when `ci_commit` will be saved, where it should not be.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-com/support-forum/issues/717 https://gitlab.com/gitlab-com/support-forum/issues/715 https://gitlab.com/gitlab-org/gitlab-ce/issues/17596 https://gitlab.com/gitlab-com/support-forum/issues/714 https://gitlab.com/gitlab-org/gitlab-ce/issues/13402

cc @rymai 


See merge request !4214
 2016-05-19 21:42:24 +00:00
Douwe Maan 3f6f2bbe14 Merge branch 'create-todo-on-failing-build' into 'master' 
Create a todo on failing MR build

Implements #14067. I worked on this with @DouweM (any mistakes are mine).

When a build fails for a commit, create a todo for the author of the merge request that commit is the HEAD of. If the commit isn't the HEAD commit of any MR, don't do anything. If there already is a todo for that user and MR, don't do anything.

Current limitations:
- This isn't configurable by project.
- The author of a merge request might not be the person who pushed the breaking commit.
- I haven't tested this with a working CI setup, just with the unit tests below and by modifying my DB directly.


See merge request !3177
 2016-05-19 21:18:22 +00:00
Kamil Trzcinski b876993677 Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios 2016-05-19 15:51:41 -05:00
Douwe Maan bd0cecfdf6 Merge branch 'with-pipeline-view' into 'master' 
Add pipeline view

This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653

cc @DouweM @grzesiek 

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625


See merge request !3703
 2016-05-19 20:42:43 +00:00
Robert Speicher bbf0a04f5e Merge branch 'mooreniemi/gitlab-ce-issue_15236' into 'master' 
Changing the confidentiality of an issue now creates a new system note

Closes #15236.

See merge request !4189
 2016-05-19 16:27:09 +00:00
Rémy Coutable 0698113cab Move #create_confidentiality_note to Issues::UpdateService 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-18 17:43:40 -05:00
Kamil Trzcinski 4f1c636831 Create pipeline objects with parameters 2016-05-18 17:01:42 -05:00
Kamil Trzciński 08fddae744 Merge branch 'docker-registry-view' into 'master' 
Add container registry support

Tasks:

- [x] Merge docker/distribution authentication service: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3787
- [x] Implement Docker Registry API
- [x] Show a list of docker images in GitLab
- [x] Remove registry repository on project deletion
- [x] Support project rename, move and namespace rename
- [x] Use token when connecting the registry
- [x] Allow to delete images from GitLab
- [x] Support pushing from GitLab CI (gitlab-ci-token / $CI_BUILD_TOKEN)
- [x] Support GitLab Runner pulling for public repositories
- [ ] Support GitLab Runner pulling for private repositories
- [x] Add tests for Docker Registry API
- [x] Add tests for a views
- [x] Make texts nicer
- [x] Implement a backup support

- [ ] Create administration documentation https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4141
- [ ] Create user documentation

See merge request !4040
 2016-05-18 18:19:01 +00:00
Kamil Trzcinski ef60b8e168 Use pipelines.errors when communicating the error 2016-05-18 13:02:10 -05:00
Rémy Coutable f4d2a2d97b Merge branch 'fix/import-data-issue' into 'master' 
Create import data in service and fix timing issues when scheduling job

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17401

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17376

See merge request !4106
 2016-05-18 15:28:11 +00:00
Alex Moore-NiemiandRémy Coutable 483c034b86 Changing the confidentiality of an issue now creates a new system note 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-18 00:27:31 -05:00
Sean McGivernandSean McGivern 6b834f2cbc Create a todo on failing MR build 
When a build fails for a commit, create a todo for the author of the
merge request that commit is the HEAD of. If the commit isn't the HEAD
commit of any MR, don't do anything. If there already is a todo for that
user and MR, don't do anything.

Current limitations:
- This isn't configurable by project.
- The author of a merge request might not be the person who pushed the
  breaking commit.
 2016-05-17 10:17:45 +01:00
Kamil Trzcinski d0eb9438e9 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-05-16 17:13:14 -05:00
Kamil Trzcinski 23d1c45410 Fix 401 message 2016-05-16 17:12:45 -05:00
Kamil Trzcinski bc32a3ecc7 Fix offline_token http_status code 2016-05-15 10:47:38 -05:00
Kamil Trzcinski 28ed990704 Fix http status codes for container registry authentication service 2016-05-15 10:47:04 -05:00
Kamil Trzcinski 938d5b6fe4 Fix http status codes for container registry authentication service 2016-05-15 10:46:54 -05:00
Kamil Trzcinski 3d18b3a0e7 Merge branch 'docker-registry' into docker-registry-view 2016-05-15 08:53:18 -05:00
Kamil Trzcinski dfd0e2450a Improve authentication service specs 2016-05-15 08:52:26 -05:00
Kamil Trzcinski b575b2f1ef Fix Container Service full access token 2016-05-15 08:47:48 -05:00
Kamil Trzcinski 003526e2ee Add method new_pipeline 2016-05-14 19:47:16 -05:00
Kamil Trzcinski f63b6fc297 Merge branch 'docker-registry' into docker-registry-view 2016-05-14 18:23:55 -05:00
Kamil Trzcinski f4f9184a01 Rename JWT to JSONWebToken 2016-05-14 18:23:31 -05:00
Kamil Trzcinski 5c19476286 Merge branch 'docker-registry' into docker-registry-view 2016-05-14 14:28:08 -05:00
Kamil Trzcinski 715a8cfa2f Fix authentication service 2016-05-14 14:27:56 -05:00
Kamil Trzcinski 9eeea4245b Merge branch 'docker-registry' into docker-registry-view 2016-05-14 14:23:00 -05:00
Kamil Trzcinski d40bd7419f Fix authentication service 2016-05-14 14:22:45 -05:00
Kamil Trzcinski 654d5ad3f4 Merge branch 'docker-registry' into docker-registry-view 2016-05-14 11:15:33 -05:00
Kamil Trzcinski 63cdf1aeb0 Use Auth::ContainerRegistryAuthenticationService 2016-05-14 11:11:48 -05:00
Kamil Trzcinski ecee057795 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-05-13 17:15:09 -05:00
Kamil Trzcinski f4f59d0f13 Merge branch 'docker-registry' into docker-registry-view 2016-05-13 17:15:01 -05:00
Kamil Trzcinski 0958f331d1 Merge remote-tracking branch 'origin/master' into docker-registry 
# Conflicts:
#	config/initializers/1_settings.rb
 2016-05-13 17:14:46 -05:00
Kamil Trzcinski 692b5e0b47 Merge branch 'docker-registry' into docker-registry-view 
# Conflicts:
#	app/controllers/jwt_controller.rb
#	app/services/jwt/container_registry_authentication_service.rb
 2016-05-13 16:43:49 -05:00
Kamil Trzcinski 9ef9e008fe Move JWT to Gitlab::JWT 2016-05-13 16:22:50 -05:00
Kamil Trzcinski 9e318bd99d Fix container registry permissions 2016-05-13 12:20:23 -05:00
James Lopez 8eb67187d0 removed transaction stuff 2016-05-13 13:12:21 +02:00
Gabriel Mazetto f5a0ac0fc1 Codestyle: make sure we have space around operators 2016-05-13 04:46:56 -03:00
Kamil Trzcinski 0d43b92706 Fix CI tests 2016-05-12 13:08:18 -05:00
Kamil Trzcinski 5c2f2fd289 Fix CI tests 2016-05-12 13:03:04 -05:00
Kamil Trzcinski 4d84ba43d8 Merge branch 'docker-registry' into docker-registry-view 2016-05-12 12:48:41 -05:00
Kamil Trzcinski fc2d985bfa Fix CI tests 2016-05-12 12:47:55 -05:00
James Lopez cacbecd05c more changes based on MR feedback 2016-05-12 18:27:20 +02:00
James Lopez f4ab8ea496 rename method 2016-05-12 17:16:35 +02:00
James Lopez ef7f793dc4 fix silly typo 2016-05-12 10:12:29 +02:00
James Lopez 1074980abb Merge branches 'fix/import-data-issue' and 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-data-issue 2016-05-11 17:54:25 +02:00
James Lopez 5c59ba35c9 fix complexity of method 2016-05-11 15:08:27 +02:00
James Lopez 68aca6f663 trying to fix timing issue with import status 2016-05-11 11:37:49 +02:00
Stan Hu f2548f3f2b Improve log message when a project is destroyed to include the namespace 2016-05-10 22:07:13 -07:00
James Lopez 1322c981a0 create import data in service 2016-05-10 11:10:51 +02:00
Kamil Trzcinski fe2137d871 Improve pipelines design 2016-05-10 02:26:13 +03:00