Felipe Artur
f04c5b27f0
current_user.confirmed_at.present? => current_user.confirmed?
2016-05-20 13:52:42 -04:00
Robert Speicher
f26389a02a
Merge branch 'feature/runner-config-untagged-jobs' into 'master'
...
Add config for CI Runner that prevents it from picking untagged jobs
Closes #3456
See merge request !4039
2016-05-19 21:54:33 +00: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
Grzegorz Bizon
4cc77c3bf8
Minor runner-related code refactorings
2016-05-19 22:01:53 +02:00
Grzegorz Bizon
52ba3a2d05
Display validation errors when admin edits a runner
2016-05-19 22:01:53 +02:00
Grzegorz Bizon
9fd6f1b600
Improve displaying validation messages for runner
2016-05-19 22:01:53 +02:00
Grzegorz Bizon
dd8e9e2d7a
Add custom validator to runner model
2016-05-19 22:01:53 +02:00
Jacob Schatz
86b22b4f15
Merge branch 'project-variables-ui' into 'master'
...
Project variables UI
Closes #14091
See merge request !3942
2016-05-19 18:09:04 +00: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
Dmitriy Zaporozhets
b7d83acf5b
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2016-05-18 12:48:50 -05:00
Dmitriy Zaporozhets
253a017b01
Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2016-05-18 12:48:23 -05:00
Kamil Trzcinski
98a7486ba7
Verify if registry is enabled in registry
2016-05-18 12:28:48 -05:00
Kamil Trzcinski
2f1cb7ce04
Improve code design
2016-05-18 11:22:28 -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
Kamil Trzcinski
24145592e8
Provide full test coverage to lib/container_registry API implementation
2016-05-17 13:20:11 -05:00
Kamil Trzcinski
d0eb9438e9
Merge remote-tracking branch 'origin/master' into with-pipeline-view
2016-05-16 17:13:14 -05:00
Kamil Trzcinski
bf4dc75801
Improve the pipelines design
2016-05-16 16:48:27 -05:00
Kamil Trzcinski
eb42f95c18
Merge remote-tracking branch 'origin/master' into docker-registry-view
2016-05-16 16:15:40 -05:00
Douwe Maan
8b15628dd0
Merge branch 'issue_14684' into 'master'
...
Toggle email signup confirmation in admin settings
Implements toggling verification email #14684
See merge request !3862
2016-05-16 21:05:05 +00:00
Robert Speicher
f234388992
Merge branch '13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-login' into 'master'
...
Force password change after admin reset
Closes #13691 .
See merge request !4016
2016-05-16 18:04:23 +00:00
Felipe Artur
7bb84e6497
Change landing page when skipping confirmation email and add documentation
2016-05-16 14:56:32 -03:00
Felipe Artur
c5526a2d9a
Change skip_user_confirmation_email to send_user_confirmation_email
2016-05-16 14:56:32 -03:00
Felipe Artur
71ca2de7aa
Toggle email signup confirmation in admin settings
2016-05-16 14:56:32 -03:00
Douwe Maan
59e62fc486
Merge branch 'docker-registry' into 'master'
...
Added authentication service for docker registry
This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes.
I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry?
What do you think @jacobvosmaer @sytses @marin?
cc @marin
See merge request !3787
2016-05-16 17:20:31 +00:00
Phil Hughes
bda2c44a0b
Project variables UI
...
Closes #14091
2016-05-16 10:21:51 +01:00
Sean McGivern
bec350528c
Force password change after admin reset
...
When an admin changes a user's password for them, force the user to
reset the password after logging in by expiring the new password
immediately.
2016-05-16 09:21:24 +01:00
Kamil Trzcinski
28233e00dc
Merge branch 'docker-registry' into docker-registry-view
2016-05-15 00:34:24 -05:00
Kamil Trzcinski
8d445fe665
Improve JwtController
2016-05-14 19:45:33 -05:00
Kamil Trzcinski
c275c91373
Change abilities from container_registry to container_image
2016-05-14 18:26:26 -05:00
Kamil Trzcinski
f4f9184a01
Rename JWT to JSONWebToken
2016-05-14 18:23:31 -05:00
Kamil Trzcinski
2566c89a32
Remove testing delegate
2016-05-14 15:55:00 -05:00
Kamil Trzcinski
46cc04ce7a
Add TODO
2016-05-14 14:17:04 -05:00
Kamil Trzcinski
ee725db8e0
Add TODO
2016-05-14 14:16:44 -05:00
Kamil Trzcinski
a77686d593
Merge branch 'docker-registry' into docker-registry-view
2016-05-14 14:05:57 -05:00
Kamil Trzcinski
393459b2b2
Improve code design after review
2016-05-14 14:04:04 -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
a6b8d36ae9
Fix specs
2016-05-14 09:46:38 -05:00
Douwe Maan
e5ce166806
Satisfy Rubocop
2016-05-13 17:31:58 -05:00
Douwe Maan
9a3ed265e9
Use @diff_notes_disabled instead of @comments_allowed
2016-05-13 17:31:58 -05:00
Douwe Maan
99d3e21f19
Extract LegacyDiffNote out of Note
2016-05-13 17:31:43 -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
e900ff972a
Improve JwtController code
2016-05-13 16:23:02 -05:00
Kamil Trzcinski
9ef9e008fe
Move JWT to Gitlab::JWT
2016-05-13 16:22:50 -05:00
James Lopez
8eb67187d0
removed transaction stuff
2016-05-13 13:12:21 +02:00
Felipe Artur
Robert Speicher
Douwe Maan
Grzegorz Bizon
Jacob Schatz
Kamil Trzcinski
Dmitriy Zaporozhets
Rémy Coutable
Phil Hughes
Sean McGivern
Douwe Maan
James Lopez