home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
29,470 Commits 48 Branches 340 Tags
a0adafddd0ce40c4ce9f052d2ee5e8ea38a2fb58
Commit Graph
1033 Commits
Author SHA1 Message Date
Kamil Trzcinski 9839bbae9c Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 2016-06-07 10:27:27 +02:00
Kamil Trzcinski dbf235f514 Fix tests failures 2016-06-07 10:25:57 +02:00
Kamil Trzcinski d225de32cb Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 2016-06-06 11:21:54 +02:00
Kamil Trzcinski 842f0a3401 Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 
# Conflicts:
#	features/steps/shared/builds.rb
#	spec/requests/ci/api/builds_spec.rb
 2016-06-06 11:21:39 +02:00
Kamil Trzcinski 7ad7e10fee Merge remote-tracking branch 'origin/master' into rename-ci-commit 2016-06-06 11:20:17 +02:00
Sean McGivernandAlfredo Sumaran 071ad63630 Spec label add / delete in UpdateService 2016-06-03 17:14:23 -05:00
Sean McGivernandAlfredo Sumaran 165d799fb3 Allow bulk-updating to remove all labels 
Instead of passing `remove_label_ids`, just pass an empty array for
`label_ids` (and don't pass `add_label_ids` or `remove_label_ids`).
 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 116f5f26ea Fix statement 2016-06-03 17:14:23 -05:00
Sean McGivernandAlfredo Sumaran 81a21c945e WIP: allow adding and removing labels in bulk 2016-06-03 17:11:41 -05:00
Robert Speicher 8e7e3be5a1 Merge branch 'rubocop/enable-empty-lines-around-access-modifier-cop' into 'master' 
Enable Style/EmptyLinesAroundAccessModifier rubocop cop

Keep blank lines around access modifiers.

See #17478

See merge request !4452
 2016-06-03 16:35:34 +00:00
Z.J. van de Weg 77d4d5e3a6 🚓 2016-06-03 16:35:56 +02:00
Kamil Trzcinski 1927a2d30b Rename all ci_commit[s] in application code to pipeline[s] 2016-06-03 16:27:50 +02:00
Kamil Trzcinski 393ec8e74a Rename commit to pipeline in application code 2016-06-03 16:22:53 +02:00
Z.J. van de Weg 9d491712cf Merge branch 'master' into awardables 2016-06-03 15:20:11 +02:00
Kamil Trzcinski 0a51c95464 Merge remote-tracking branch 'origin/master' into rename-ci-commit 2016-06-03 13:10:01 +02:00
Grzegorz Bizon e052daa08a Enable Style/EmptyLinesAroundAccessModifier rubocop cop 
See #17478
 2016-06-03 10:34:20 +02:00
James LopezandRobert Speicher 097eafc8c7 fix some issues and improved error output for forking 2016-06-02 21:48:26 -04:00
James LopezandRobert Speicher b2b3e0e6ee fix empty message on shell error 2016-06-02 21:47:39 -04:00
James LopezandRobert Speicher b2b2b2f9de fix create service error handling - missing setting import status to failed 2016-06-02 21:47:38 -04:00
Kamil Trzcinski 021d3810c3 Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipeline 2016-06-02 16:59:04 +02:00
Z.J. van de Weg fab695461a Move awardables too when issue is moved 2016-06-01 18:33:49 +02:00
Z.J. van de Weg 91a7b9333b Incorportate feedback 2016-06-01 12:10:08 +02:00
Rémy Coutable c12c77eb25 Merge branch 'feature/improve_wiki_page_events' into 'master' 
Include Wiki attributes in Wiki page events webhook

The hook data we are sending is not 100% correct (we send details of the project, but should also send details of the "ProjectWiki" attributes like URLs and repositories relative to the wiki itself).

This is a follow up to #17506

Fixes #17507

See merge request !4138
 2016-05-31 18:10:23 +00:00
Gabriel Mazetto aaaed331ba Fix hook data for Wiki Page event 
Added "wiki" section and removed "repository"
 2016-05-31 11:24:58 -03:00
Kamil Trzcinski 7b0e2bbc80 Fix the use of CurrentSettings in ContainerRegistryAuthenticationService 2016-05-31 13:48:05 +02:00
Kamil Trzcinski 846d111f1d Add Application Setting to configure Container Registry token expire delay (default 5min) 2016-05-31 13:23:13 +02:00
Stan Hu 9951243bf4 Merge branch 'make-container-registry-authentication-service-compatible-with-older-docker' into 'master' 
Make authentication service for Container Registry to be compatible with < Docker 1.11

This removes the usage of `offline_token` which is only present when using `Docker 1.11.x` instead we relay on `scope`. This should make it compatible with any client starting from 1.6 (I did test only 1.8 and up).

Right now we return 403 if unauthorized user doesn't have access to anything. In all other cases we return token, but with empty `access`, which simply disallow requested action.



See merge request !4363
 2016-05-31 03:18:33 +00:00
ZJ van de Weg cbd7801b3d Merge branch 'master' into awardables 2016-05-30 18:54:08 +02:00
Kamil Trzcinski 7ec1fa212d Make authentication service for Container Registry to be compatible with < Docker 1.11 2016-05-30 16:57:39 +02:00
Grzegorz Bizon a55e8f109f Enable Style/NegatedIf Rubocop cop 
Favor `unless` over `if` for negative conditions
(or control flow ||).

See #17478
 2016-05-30 13:53:25 +02:00
Grzegorz BizonandRobert Speicher f739a4e871 Remove reduntant note validation from create service 2016-05-29 15:03:00 -04:00
Josh Frye 85495c8c85 Merge branch 'remove-main-language' into 'master' 
Remove main_language and tests. Closes #14937



See merge request !4293
 2016-05-26 14:49:25 +00:00
Josh Frye 6d2a0a6b9b Remove main_language and tests 2016-05-25 17:16:42 -04:00
Felipe Artur 5273335247 Fix forks creation when visibility level is restricted 2016-05-25 10:57:00 -04:00
ZJ van de Weg 7ae536002a Merge branch 'master' into awardables 2016-05-25 14:41:25 +02:00
Kamil TrzcinskiandGrzegorz Bizon 646018a40e Fix the CI login to Container Registry (the gitlab-ci-token user) 2016-05-23 00:34:51 +02:00
Kamil Trzcinski 4474eab4f6 Fix container deletion permission issue 2016-05-20 18:43:11 -05:00
Douwe Maan baccd1838c 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-20 21:41:02 +00:00
Douwe Maan fc1910ddc5 Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename' 
# Conflicts:
#	app/services/system_note_service.rb
 2016-05-20 16:23:04 -05:00
Douwe Maan ba5b47c2e3 Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master' 
Implement special GitLab markdown reference for milestones

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions:

- Move changelog item to 8.8
- Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829

See merge request !3897
 2016-05-20 21:08:57 +00:00
Jeroen Jacobs 7880a300dc Allows MR authors to have the source branch removed when merging the MR 2016-05-20 11:30:03 +02:00
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 f29d8b64e4 Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/milestone-md 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-18 23:40:33 -05: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
Fatih Acet 6c89e2fd41 Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardables 2016-05-18 13:23:40 -05:00