home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,450 Commits 48 Branches 340 Tags
v8.8.1
Commit Graph
28450 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher 9b9e3206cc Update VERSION to 8.8.1 v8.8.1 2016-05-22 21:59:54 -04:00
Robert SpeicherandRobert Speicher dbdeccdd96 Merge branch 'fix-access-to-pipelines-for-anonymous' into 'master' 
Allow anonymous user to access pipelines

## What does this MR do?

It fixes an issue where the Pipelines is shown for the Anonymous users,
but they get 404 when clicked. Their session is then logged out.

Fixes #17717.

See merge request !4233
 2016-05-22 20:43:16 -04:00
Robert Speicher c2911ca42c Update CHANGELOG 
[ci skip]
 2016-05-22 20:17:07 -04:00
Stan HuandRobert Speicher 1f9004a8f6 Merge branch 'fix/migration-helpers-mysql-compatibility' into 'master' 
Fix MySQL compatibility in zero downtime migration helpers

## What does this MR do?

This MR fixes MySQL for zero downtime migration helpers introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3860

Closes #17711

See merge request !4239
 2016-05-22 20:04:13 -04:00
Stan HuandRobert Speicher 1818e8a1e6 Merge branch 'fix-ci-login-to-registry' into 'master' 
Fix the CI login to Container Registry (the gitlab-ci-token user)

## What does this MR do?

This fixes `docker login` not succeeding when trying to do CI login: `gitlab-ci-token with $CI_BUILD_TOKEN`.

cc @marin

See merge request !4236
 2016-05-22 20:03:57 -04:00
Achilleas PipinellisandRobert Speicher 439958f31d Merge branch 'health_check_docs' into 'master' 
Add health check feature documentation

for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3888

@virtuacreative @axil 

See merge request !4199
 2016-05-22 19:30:21 -04:00
Yorick Peterse d957dfb803 Version 8.8.0 v8.8.0 2016-05-22 12:39:36 +02:00
Yorick Peterse c433b51d26 Merge branch 'fix-docker-registry-integration' into 'master' 
Fix docker registry integration

See merge request !4229
 2016-05-21 17:58:51 -05:00
Yorick Peterse 8a0eeac3c7 Removed "unreleased" from 8.8.0 
[ci skip]
 2016-05-21 17:43:17 -05:00
Douwe MaanandYorick Peterse d0d3ae0f70 Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename' 
# Conflicts:
#	app/services/system_note_service.rb
 2016-05-21 12:33:55 -05:00
Douwe MaanandYorick Peterse f2e4651486 Merge branch 'issue-17537-fix' into 'master' 
Fix Error 500 when attempting to retrieve project license when HEAD points to non-existent ref

Closes #17537

See merge request !4151
 2016-05-21 12:28:34 -05:00
Douwe MaanandYorick Peterse 24fe6171db Merge branch 'issue_14632' into 'master' 
Fix group visibility level migration in case all visibility levels are restricted

fixes #14632 

See merge request !4107
 2016-05-21 12:28:13 -05:00
Douwe MaanandYorick Peterse 284f1ea3cd Merge branch 'issue_9013' into 'master' 
Let users set notification levels in projects which they are not members

Fixes #9013 

See merge request !3986
 2016-05-21 12:27:57 -05:00
Douwe MaanandYorick Peterse 253ee7a3be 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-21 12:27:40 -05:00
Douwe MaanandYorick Peterse 063d80e9b6 Merge branch 'issue_14684_2' into 'master' 
current_user.confirmed_at.present? => current_user.confirmed?

fixes: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3862/diffs#4f7b76b1197d6fb073f77957b3b7b70d921ed7e7_42_41

See merge request !4225
 2016-05-21 12:26:49 -05: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
Yorick Peterse 5dc64ce379 Version 8.8.0-rc2 v8.8.0-rc2 2016-05-20 16:39:11 -05:00
Robert SpeicherandYorick Peterse de8c7ed14f Merge branch 'fix/url-refactor-from-ee' into 'master' 
Update CE code to include some refactor done in EE to do with import url

This is simply updating the code to match EE and avoid further conflicts related to `import_data` and `import_url` changes made on EE only.

See merge request !4223
 2016-05-20 12:20:30 -05:00
Yorick Peterse d53b4d5ba7 Merge branch 'master' into 8-8-stable 2016-05-19 17:51:00 -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
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
Jeroen van Baarsen fa7a682bb0 Merge branch 'fix-generator-templates-directory' into 'master' 
Move generator templates to generator_templates/



See merge request !4217
 2016-05-19 21:24:05 +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
Douwe Maan 18ef054bc7 Merge branch '17464-backport-email-syntax-highlighting' into 'master' 
Syntax-highlight diffs in push emails

![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png)

Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151



See merge request !4147
 2016-05-19 21:12:53 +00:00
Jeroen van Baarsen c50e7b1202 Merge branch 'fix/after-script-documentation-update' into 'master' 
Update 'after_script' introduction note

Related to gitlab-org/gitlab-ci-multi-runner#1321

See merge request !4205
 2016-05-19 21:00:12 +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 53e2d30af4 Merge branch 'fix-migration-helper-comment' into 'master' 
Removed outdated comment from migration helpers

[ci skip]

See merge request !4213
 2016-05-19 20:38:32 +00:00
Yorick Peterse e3aaab2d26 Updated Rubocop for generator_templates/ 2016-05-19 15:32:07 -05:00
Yorick Peterse a08e3c675a Merge branch 'master' into 8-8-stable 2016-05-19 15:12:50 -05:00
Grzegorz Bizon 52c8b9da37 Use migration helper to prevent downtime migration 2016-05-19 22:11:40 +02:00
Grzegorz Bizon 4cc77c3bf8 Minor runner-related code refactorings 2016-05-19 22:01:53 +02:00
Grzegorz Bizon c3c503d259 Rename method that validates runner tag constrains 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 bf9cc351c2 Add minor corrections related to config of runner 2016-05-19 22:01:53 +02:00
Grzegorz Bizon 0fd100d28d Improve setting default runner attrs when using API 2016-05-19 22:01:53 +02:00
Grzegorz Bizon f6dd8a5257 Move runner validator to separate private method 2016-05-19 22:01:53 +02:00
Grzegorz Bizon 8ab4a67ca6 Use form errors helper in CI runner edit form 2016-05-19 22:01:53 +02:00
Grzegorz Bizon 3b0eeccc03 Add not null constraint to run untagged runner option 2016-05-19 22:01:53 +02:00
Grzegorz Bizon b8cf2a340b Set run untagged option when registering a runner 2016-05-19 22:01:53 +02:00
Grzegorz Bizon 9ba72378fc Refactor CI API specs for creating runner 2016-05-19 22:01:53 +02:00
Grzegorz Bizon b253aa32c7 Add docs for a new configuration setting for runner 2016-05-19 22:01:53 +02:00
Grzegorz Bizon da8b72d453 Extend runner options that are configurable via API 2016-05-19 22:01:53 +02:00
Grzegorz Bizon 7b607cf4f0 Add Changelog entry for new runner configuration 2016-05-19 22:01:53 +02:00
Grzegorz Bizon 8001eed06e Add method that check if build has tags 2016-05-19 22:01:53 +02:00
Grzegorz Bizon 8252333183 Extend CI runners specs 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 2ee24bd9ec Update specs to be valid only for tagged 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
Grzegorz Bizon 9129c37c5b Add CI API tests for runner config and untagged jobs 2016-05-19 22:01:53 +02:00