28471 Commits
Author SHA1 Message Date
Yorick Peterse 93450d3671 Version 8.8.2 v8.8.2 2016-05-25 16:30:03 +02:00
Yorick Peterse ee9af4595d Fixed 8.8.2 changelog 2016-05-25 15:00:46 +02:00
Jacob SchatzandYorick Peterse 820c1c3abc Merge branch 'incremental-fixes' into 'master'
Fix concurrent request when updating build log in browser

If you have a slow internet connection the trace will not be updated correctly. We need to check if our request is the latest one.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17535

See merge request !4183
2016-05-25 15:00:03 +02:00
Yorick Peterse 4e8798eef0 Moved gitignore dropdown entry to 8.8.2 2016-05-25 13:05:33 +02:00
Douwe MaanandYorick Peterse ce8773fec6 Merge branch 'zj-gitignore-dropdown' 2016-05-25 13:04:26 +02:00
Yorick Peterse baf0747643 Added missing backup/UI 8.8.2 changelog entries 2016-05-25 13:04:04 +02:00
Jacob SchatzandYorick Peterse b317945145 Merge branch 'dropdown-enter-select' into 'master'
Fixed issue with enter key selecting wrong option in dropdown

If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0

![labels](/uploads/eb29924109947fd63fea32e21471f05a/labels.gif)

Closes #17630

See merge request !4210
2016-05-25 13:02:48 +02:00
Jacob SchatzandYorick Peterse d5640394b5 Merge branch 'merge-immediately-button-color-fix' into 'master'
Fixed issue with merge button color

![Screen_Shot_2016-05-19_at_12.51.35](/uploads/a2768908553961e88c5a8f0e1f343078/Screen_Shot_2016-05-19_at_12.51.35.png)

Closes #17644

See merge request !4211
2016-05-25 13:01:43 +02:00
Robert SpeicherandYorick Peterse d6957280c7 Merge branch 'patch-2' into 'master'
Update branch name from 8-7-stable to 8-8-stable

Fix inconsistency with the command listed above.

[ci skip]

See merge request !4274
2016-05-25 13:00:38 +02:00
Robert SpeicherandYorick Peterse ef04b7366b Merge branch 'fix_typo_on_monitoring_help_page' into 'master'
Fix typo in link on monitoring help page

Closes #17809

[ci skip]

See merge request !4281
2016-05-25 12:58:44 +02:00
Douwe MaanandYorick Peterse f64fb6dd72 Merge branch 'fix-registry-backups' into 'master'
Fix backups if registry is disabled

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17749

See merge request !4263
2016-05-25 11:53:12 +02:00
Yorick Peterse c0206b51aa Updated 8.8.2 CHANGELOG 2016-05-25 11:45:52 +02:00
Jacob SchatzandYorick Peterse e3935551aa Merge branch '17736-builds-hotfix' into 'master'
Fix builds page

Fixes #17736    
Fixes #17703 

- Move tags into column
- Put column headers back

<img src="/uploads/57609fd2d65c3b80f57b32cbbe316653/Screen_Shot_2016-05-23_at_10.20.37_AM.png" width="800px">    



See merge request !4249
2016-05-25 11:43:16 +02:00
Robert SpeicherandYorick Peterse 5682320ff8 Merge branch 'fix-ci-charts-error-500' into 'master'
Fix Error 500 in CI charts by gracefully handling commits with no durations

## What does this MR do?

In the CI charts, this MR reports the duration of a commit to 0 if it is `nil`.

## Are there points in the code the reviewer needs to double check?

Should we omit this commit from the chart or set it to some other value?

## Why was this MR needed?

We were getting an Error 500 here: https://gitlab.com/gitlab-org/gitlab-ce/graphs/master/ci

## What are the relevant issue numbers?

#17730 


See merge request !4245
2016-05-25 11:42:37 +02:00
Stan HuandYorick Peterse 8a494ecd42 Merge branch 'fix/application-settings-error-default-value' into 'master'
Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources

## What does this MR do?

When upgrading to GitLab 8.8, an admin would encounter an Error 500 due to a `nil` `disabled_oauth_sign_in_sources`. This MR ensures that the value will be a blank array if empty.

Closes #17564

See merge request !4242
2016-05-25 11:42:23 +02:00
Achilleas PipinellisandYorick Peterse b24d2b46a3 Merge branch 'container-registry-user-docs' into 'master'
Initial version of user documentation of container registry

cc @axil


See merge request !4244
2016-05-25 11:38:56 +02:00
Yorick Peterse afe6749360 Moved CHANGELOG for !4233 to 8.8.2 2016-05-25 11:30:54 +02:00
Robert SpeicherandYorick Peterse 2b7b6c2366 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-25 11:30:40 +02:00
Yorick Peterse 41702b808f Added CHANGELOG for MR !4209 2016-05-25 11:25:00 +02:00
Jacob SchatzandYorick Peterse 675a083335 Merge branch 'remove-due-date' into 'master'
Added remove due date button

In the sidebar when there is a due date a link to remove due date becomes visible

![remove-due-date](/uploads/126baa61f5ec44ce503ce374d5331ba6/remove-due-date.gif)

Closes #17392

See merge request !4209
2016-05-25 11:22:26 +02:00
Achilleas PipinellisandYorick Peterse 669fc3b9b8 Merge branch 'registry_admin_docs' into 'master'
Docker container registry configuration docs.

Part of gitlab-org/omnibus-gitlab!764 and gitlab-org/gitlab-ce!4040

See merge request !4141
2016-05-25 11:21:56 +02:00
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