home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 05:56:37 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,371 Commits 48 Branches 340 Tags
52ba3a2d05ab93caa5ddbc6207359e99301dda91
Commit Graph
966 Commits
Author SHA1 Message Date
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 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
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
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 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 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 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 d05f0030a3 Added Docker Registry View tests 2016-05-09 23:32:18 +03:00
Kamil Trzcinski d5d8e76bd7 Block renaming project or repository if it has container registry tags 2016-05-09 22:41:48 +03:00
Kamil Trzcinski 565a5e36fc Merge branch 'docker-registry' into docker-registry-view 2016-05-09 22:12:34 +03:00
Kamil Trzcinski b180d79cdc Rename DockerAuthenticationService to ContainerRegistryAuthenticationService 2016-05-09 22:04:42 +03:00
Kamil Trzcinski daca2144c8 Make code more clear in what is done 2016-05-09 20:47:06 +03:00
Kamil Trzcinski 71da2e0b56 Merge remote-tracking branch 'origin/master' into docker-registry 2016-05-09 20:21:02 +03:00
Robert Speicher 4bc4f06512 Merge branch 'escape-commit-titles' into 'master' 
Escape HTML in commit titles in system note messages

Closes #17348

See merge request !4084
 2016-05-08 23:53:49 +00:00
Stan Hu adf9a51899 Escape HTML in commit titles in system note messages 
Closes #17348
 2016-05-07 08:41:10 -07:00
Stan Hu a65de9c2c1 Reduce delay in destroying a project from 1-minute to immediately 
Run ProjectDestroyWorker after pending_delete attribute has been committed to DB
 2016-05-07 01:12:31 -07:00
Douwe Maan 0cdd4f310f Merge branch '14564-mr-automatic-title' into 'master' 
Auto-set title for branches created from issues

This sets the title for a new MR to 'Resolves "$issue-title"' when:
- The source branch for the MR begins with a value iid.
- The MR has more than one commit in its diff (if there's one commit, keep using the commit's first line).
- The iid does not point to a confidential issue.

Single commit:

![A single commit uses the commit title](/uploads/cd34f59cd67f095c3034fae07950f8b5/image.png)

Multiple commits:

![Multiple commits use the issue title](/uploads/a322c406ddd56913c5aebd88d16e5a5e/image.png)

Confidential issue:

![A confidential issue uses the branch name](/uploads/7ae9b79de5f6101ced46802f3c3a6e71/image.png)

cc @DouweM @zj 

Closes #14564

See merge request !3966
 2016-05-06 12:14:13 +00:00
Sean McGivern 09209725ce Don't auto-set MR title for confidential issues 2016-05-06 12:24:37 +01:00
Sean McGivern e76f339dcd Auto-set title for branches created from issues 
If a branch starts with an issue's IID, followed by a hyphen, the
description will be updated to say that is closes the issue. This also
updates the title of the merge request to 'Resolves "$issue-title"', as
long as:
- There is more than one commit in the merge request (if there is only
  one commit, the commit's title will be used as before)
- The issue's IID is valid for the project
 2016-05-06 12:24:37 +01:00