home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,338 Commits 48 Branches 340 Tags
c2bd71fda65d5e2eae5f4c36bb8548a7a8c1937e
Commit Graph
990 Commits
Author SHA1 Message Date
ZJ van de Weg 4d6c51e228 Fix backend merge mistakes 
[ci skip]
 2016-05-19 15:00:50 -05:00
Fatih Acet 6c89e2fd41 Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardables 2016-05-18 13:23:40 -05:00
Fatih Acet a410c7afbf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables 2016-05-18 13:20:06 -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
Fatih Acet bb883387f9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/note.rb
#	db/schema.rb
#	spec/models/note_spec.rb
 2016-05-18 13:05:53 -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
ZJ van de Weg e0cabb67d0 Fix latests concerns 2016-05-18 08:47:15 -05:00
Kamil Trzcinski 24145592e8 Provide full test coverage to lib/container_registry API implementation 2016-05-17 13:20:11 -05:00
Kamil Trzcinski eb42f95c18 Merge remote-tracking branch 'origin/master' into docker-registry-view 2016-05-16 16:15:40 -05:00
Kamil Trzcinski c275c91373 Change abilities from container_registry to container_image 2016-05-14 18:26:26 -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 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 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
Zeger-Jan van de Weg 2f0d89ecff Merge branch 'master' into awardables 2016-05-11 22:34:25 +02: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
Zeger-Jan van de Weg 7e6dcf9cd0 Merge branch 'master' into awardables 2016-05-11 08:47:04 +02:00
Grzegorz Bizon 7d6d3421d6 Share form editable attributes mf runner via model 2016-05-10 14:21:01 +02:00
Zeger-Jan van de Weg dccf8a9fc8 Add tests on Awardables and Award Emoji 2016-05-10 12:03:13 +02: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
Zeger-Jan van de Weg 3bdc57f0a7 Create table for award emoji 2016-05-06 10:47:11 +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
Jacob Vosmaer 23a3e3756a Inform user about questionable hook success 2016-05-03 13:40:59 +02:00
Jacob Vosmaer f4e0c56279 Improve documentation and web test for web hooks 
I wanted to share what I learned trying to debug web hooks using
netcat.
 2016-05-03 13:03:10 +02:00
Robert Speicher 0652d92526 Merge branch '15527-fix-wiki-page-creation-issue' into 'master' 
Fix error when trying to create a wiki page

Closes #15527, #15569, #15623, #15630, #15637, #15653, #15870, #16558, #16875, #16987, #17016, https://github.com/gitlabhq/gitlabhq/issues/10317.

See merge request !3924
 2016-05-02 17:18:22 +00:00
Robert Speicher ec2710d0f5 Merge branch 'feature/backport-safewebhooks' into 'master' 
Backported minimal safewebhook implementation to GitLab CE

This brings a minimal implementation for gitlab-org/gitlab-ce#13478
backported from EE (gitlab-org/gitlab-ee!334).

Also added UI to configure Secret Token

Fixes #15365.

See merge request !3940
 2016-05-02 15:13:42 +00:00
Gabriel Mazetto 00ced598ea Added UI to define secret_token for webhook and systemhook 
Codestyle changes to easy EE merge
 2016-05-02 10:32:01 -03:00
Grzegorz Bizon c9577711ce Handle issue move access instead of raising error 
Closes #15533
 2016-04-30 21:28:40 +02:00
Rémy CoutableandStan Hu 3811eb0ba1 Fix error when trying to create a wiki page 
Closes #15527.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-29 06:50:18 -07:00
Paco Guzman c4b9bd0413 API support for the 'since' and 'until' operators on commit requests 
- Parameter validation as ISO8601 format
 2016-04-29 09:26:52 +02:00
Jacob Schatz 73990df32f Merge branch 'async-new-branch-button' into 'master' 
Load the "New Branch" button asynchronously

Here's how it looks like for logged in users:

![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif)

And here it is for anonymous users (or when a new branch can't be created by a logged in user):

![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif)

See merge request !3855
 2016-04-28 21:00:22 +00:00