home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,503 Commits 48 Branches 340 Tags
v8.8.3
Commit Graph
1005 Commits
Author SHA1 Message Date
Jacob SchatzandYorick Peterse 2b4313140d Merge branch 'merge-button-color-fix' into 'master' 
Fixed issue with button color when no CI enabled

## What does this MR do?

Fixes an issue with the color of the merge button when no CI is setup.

## What are the relevant issue numbers?

Closes #17844

## Screenshots

![Screen_Shot_2016-05-25_at_09.58.44](/uploads/87aac74c5e2f8bfd2831e99c5915856d/Screen_Shot_2016-05-25_at_09.58.44.png)

See merge request !4287
 2016-06-02 13:21:58 +02:00
Douwe MaanandYorick Peterse 2cbaf3c43a Merge branch 'rm-source-branch' into 'master' 
Allows MR authors to have the source branch removed when merging the MR


closes #13191 

The location of the checkbox might not be optimal so any feedback is welcome. Any other feedback too obviously.

Screenshot:
![Screenshot_2016-02-17_21.25.24](/uploads/a9c3eaafb39c6f5b4f0949a2278af6da/Screenshot_2016-02-17_21.25.24.png)

See merge request !2801
 2016-05-21 12:26:33 -05: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 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

![Screen_Shot_2016-04-27_at_09.01.23](/uploads/cb9b1ac42aa734cfd3271c03dfaccc12/Screen_Shot_2016-04-27_at_09.01.23.png)

![Screen_Shot_2016-04-27_at_09.01.29](/uploads/4f317014d60f205a0e29497ad20f8a2e/Screen_Shot_2016-04-27_at_09.01.29.png)

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
Phil Hughes bda2c44a0b Project variables UI 
Closes #14091
 2016-05-16 10:21:51 +01:00
Kamil Trzcinski c275c91373 Change abilities from container_registry to container_image 2016-05-14 18:26:26 -05:00
Kamil Trzcinski 2566c89a32 Remove testing delegate 2016-05-14 15:55:00 -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
James Lopez 8eb67187d0 removed transaction stuff 2016-05-13 13:12:21 +02: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
Jacob Schatz f2303f9df0 Merge branch 'send-incremental-build-log' into 'master' 
Update build log incrementally

Proof of concept implementation of incremental sending of build log to browser.

cc @jschatz1 @vsizov @grzesiek @tmaczukin 


See merge request !3737
 2016-05-12 16:48:42 +00:00
James Lopez 6a70c060fa Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-data-issue 2016-05-12 18:39:52 +02:00
James Lopez cacbecd05c more changes based on MR feedback 2016-05-12 18:27:20 +02:00
Rémy Coutable 66824e09e2 Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master' 
Reuse runners edit form in admin and project area

Reuse runners edit form in admin and project area.

![reuse_runner_form](/uploads/d16e3ee196151b68f584d947f38a7c29/reuse_runner_form.png)

See merge request !4094
 2016-05-12 15:25:56 +00:00
Robert Speicher d8415389de Merge branch 'hook-docs-behavior' into 'master' 
Improve documentation and web test for web hooks

Tips and documentation of actual hook behavior. Improved user feedback
when testing hooks via the web UI.

See merge request !4015
 2016-05-11 16:34:00 +00:00
James Lopez 68aca6f663 trying to fix timing issue with import status 2016-05-11 11:37:49 +02:00
Grzegorz Bizon 7d6d3421d6 Share form editable attributes mf runner via model 2016-05-10 14:21:01 +02:00
Kamil Trzcinski fe2137d871 Improve pipelines design 2016-05-10 02:26:13 +03:00
Kamil Trzcinski 7c1acb022a Merge remote-tracking branch 'origin/master' into with-pipeline-view 
# Conflicts:
#	app/views/projects/ci/builds/_build.html.haml
#	app/views/projects/commit/_ci_commit.html.haml
#	app/views/projects/commit/_commit_box.html.haml
 2016-05-09 23:53:02 +03:00
Kamil Trzcinski 6086958002 Rename image to container_registry 2016-05-09 22:34:10 +03:00
Kamil Trzcinski 08396be619 Rename ImageRegistry to ContainerRegistry 2016-05-09 22:14:46 +03:00
Kamil Trzcinski 565a5e36fc Merge branch 'docker-registry' into docker-registry-view 2016-05-09 22:12:34 +03:00
Kamil Trzcinski 74520f23db Encode state as base64 string 2016-05-09 20:19:27 +03:00
Kamil Trzcinski baef6728fa Send trace to a browser incrementally when build is running 
We send a state of ansi2html to client, client needs to send this state back.
The state describes the configuration of generator and position within trace.
 2016-05-09 19:59:45 +03:00
Kamil Trzcinski 5196f8e993 WIP 2016-05-08 22:50:30 +02:00
Douwe Maan 6a8359f3d3 Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits' 
# Conflicts:
#	Gemfile.lock
 2016-05-04 17:27:47 +02:00
Kamil Trzcinski 9243b6d019 Implement Container Registry API client 2016-05-04 14:22:54 +02:00
Kamil Trzcinski b0ddbaa07c Added docker registry view 2016-05-04 11:31:35 +02:00
Jacob Vosmaer 6957fb7c4f Always mention HTTP status 2016-05-03 13:42:56 +02:00