28505 Commits
Author SHA1 Message Date
Robert Speicher d4c3f1735d Update VERSION to 8.8.4 v8.8.4 2016-06-09 16:46:53 -04:00
Robert SpeicherandRobert Speicher 00cae51eda Merge branch 'rs-fix-ldap-2fa-login' into 'master'
Fix 2FA-based login for LDAP users

The OTP input form is shared by both LDAP and standard logins, but when
coming from an LDAP-based form, the form parameters aren't nested in a
Hash based on the `resource_name` value.

Now we check for a nested `remember_me` parameter and use that if it
exists, or fall back to the non-nested parameters if it doesn't.

Somewhat confusingly, the OTP input form _does_ nest parameters under
the `resource_name`, regardless of what type of login we're coming from,
so that allows everything else to work as normal.

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

See merge request !4493
2016-06-09 14:53:12 -04:00
Robert Speicher 374d212b05 Update VERSION to 8.8.3 v8.8.3 2016-06-02 14:43:27 -04:00
Robert Speicher cde5625d72 Update CHANGELOG for 8.8.3 2016-06-02 13:21:59 -04:00
Robert SpeicherandRobert Speicher ca24ea5241 Merge branch 'issue_18102' into 'master'
Fixes missing number on generated ordered list

Closes #18102

See merge request !4437
2016-06-02 13:17:17 -04:00
Stan HuandYorick Peterse e8e4dbc179 Merge branch 'fix-inline-filter-speed' into 'master'
Fix serious performance bug with rendering Markdown with InlineDiffFilter

Nokogiri's `node.replace` was being unnecessarily called for every text node in
the document due to a comparison bug. The code previously was comparing the
HTML representation of the full document against the text node, which would
always fail. Fix the comparison to just compare the modified text.

Closes #18011

See merge request !4392
2016-06-02 16:56:42 +02:00
Robert SpeicherandYorick Peterse 3799edd78c Merge branch 'data_leak' into 'master'
Confidential notes data leak

Fixes part of https://gitlab.com/gitlab-org/gitlab-ee/issues/575

See merge request !1967
2016-06-02 13:49:18 +02:00
Rémy CoutableandYorick Peterse e30c651bbd Merge branch 'chujinjin/gitlab-ce-fix_wiki_project_clone_address_error' into 'master'
Fix wiki project clone address error

_Note: Originally opened at !4407 by @chujinjin._

---

fix wiki project clone address error in Wiki Git Access View, show as below:

![image](/uploads/5e3bf6d1418c42862a885319c31bc3cf/image.png)

Fixes #17643.

See merge request !4429
2016-06-02 13:46:06 +02:00
Stan HuandYorick Peterse e601e683bc Merge branch 'downcase-registry-repository' into 'master'
Use downcased path to container repository as this is expected path by Docker

Docker Engine requires path to be lowercase. This makes all container registry paths to be show and used downcased instead of mixed case.

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

See merge request !4420
2016-06-02 13:43:25 +02:00
Rémy CoutableandYorick Peterse eb48969ad5 Merge branch 'fix/error-500-in-pipeline-when-fork' into 'master'
Use project that belongs to pipeline in view

This MR makes project in pipelines view match the one that pipeline has been created for.

Closes #17943

See merge request !4376
2016-06-02 13:42:31 +02:00
Yorick Peterse 0aec06ac67 Added CHANGELOG entry for !4369 2016-06-02 13:41:19 +02:00
Douwe MaanandYorick Peterse d4ae68cdd6 Merge branch 'rs-remember-me-2fa' into 'master'
Pass the "Remember me" value to the 2FA token form

Prior, if a user had 2FA enabled and checked the "Remember me" field,
the setting was ignored because the OTP input was on a new form and the
value was never passed.

Closes #18000

See merge request !4369
2016-06-02 13:41:03 +02:00
Douwe MaanandYorick Peterse 1d94757c1a Merge branch 'container-registry-token-ttl' into 'master'
Add Application Setting to configure Container Registry token expire delay (default 5min)

This adds an option to configure Container Registry token expire delay. The default is set to 5mins (something that is also used by Docker Hub).

What is left:
* [x] Write test to check the expire_delay

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

@stanhu I think that this should land in patch release of 8.8.

See merge request !4364
2016-06-02 13:39:56 +02:00
Yorick Peterse 0df4fa78e7 Fixed CHANGELOG entry for !4363 2016-06-02 13:35:03 +02:00
Stan HuandYorick Peterse b89d3faf55 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-06-02 13:33:56 +02:00
Yorick Peterse ad65b56193 Fixed CHANGELOG entry for !4332 2016-06-02 13:31:30 +02:00
Douwe MaanandYorick Peterse ef205c885b Merge branch 'current-settings-use-request-store-during-request' 2016-06-02 13:30:00 +02:00
Yorick Peterse ac53874330 Fixed CHANGELOG entry for !4321 2016-06-02 13:27:16 +02:00
Robert SpeicherandYorick Peterse 322464ea92 Merge branch 'fix/migration-uri-issue' into 'master'
Fix import URL migration error

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

See merge request !4321
2016-06-02 13:26:44 +02:00
Yorick Peterse 0591d06b00 Fixed CHANGELOG entry for !4312 2016-06-02 13:26:03 +02:00
Douwe MaanandYorick Peterse 4cd2d46889 Merge branch 'fix-404-labels-in-todos' into 'master'
Fix 404 page when viewing TODOs that contain milestones or labels in different projects

A user viewing the TODOs page will see a 404 if there are mentioned milestones or labels in multiple different projects. This is likely a caching bug and only occurs
when Markdown rendering occurs across multiple projects, which is why it's so tricky to reproduce. This is what I think is happening:
    
1. LabelReferenceFilter#references_in encounters label ~X for ProjectA and finds the label in the DB as id = 1.
2. LabelReferenceFilter.references_in yields [1, 'X', nil, ...]
3. Since project_ref is nil, AbstractReferenceFilter#project_from_ref_cache caches nil => ProjectA.
4. LabelReferenceFilter#references_in encounters label ~Y for ProjectB and finds the label in the DB as id = 2.
5. LabelReferenceFilter.references_in yields [2, 'Y', nil, ...]
6. AbstractReferenceFilter#project_from_ref_cache lookups nil and returns ProjectA. It was supposed to be ProjectB.
7. A is the wrong project, so the label lookup fails.
   
This MR expands the `project_ref` to the right value as soon as we have it to avoid this caching bug.
    
Closes #17898


See merge request !4312
2016-06-02 13:25:30 +02:00
Jacob SchatzandYorick Peterse 6b6c5db194 Merge branch 'fix-shortcuts-spec' into 'master'
Ensure project name is present on page

## What does this MR do?
Fixes a failing spec




See merge request !4307
2016-06-02 13:25:09 +02:00
Yorick Peterse 4b03f9992b Added CHANGELOG entry for !4303 2016-06-02 13:24:13 +02:00
Jacob SchatzandYorick Peterse 46a83371d5 Merge branch 'discussion-outdated-form' into 'master'
Fixed JS error when trying to remove discussion form

## What does this MR do?

Fixes a JS error which was caused by an ID of the form not matching what was returned by the JSON. Instead of checking that, it gets the current form from the ajax success event.

This would only happen on outdated discussions because the ID of the discussion form ends with `-false` because it isn't active. However, the note is added to an active discussion so the ID returned actually ends in `-true` & therefore the JS couldn't find the correct form.

## What are the relevant issue numbers?

Closes #17778

See merge request !4303
2016-06-02 13:23:47 +02:00
Yorick Peterse 42b9a51581 Fixed CHANGELOG for !4301 2016-06-02 13:23:24 +02:00
Robert SpeicherandYorick Peterse ac98845e7a Merge branch 'fix/gitlab-importer-issue' into 'master'
Fix gitlab importer issue

Fixed credentials not being called correctly - probably some bad refactoring or search & replace... 

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565

See merge request !4301
2016-06-02 13:23:06 +02:00
Yorick Peterse 88bb7b51c9 Added CHANGELOG entry for !4287 2016-06-02 13:22:31 +02:00
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
Jacob SchatzandYorick Peterse c4abaf416c Merge branch 'generic-commit-status' into 'master'
Move tags to column in generic_commit_status

Part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4249    

cc @ayufan 



See merge request !4277
2016-06-02 13:21:31 +02:00
Yorick Peterse cf6ce9ae5d Moved CHANGELOG entry for !4230 2016-06-02 13:21:06 +02:00
Douwe MaanandYorick Peterse 66c01627af Merge branch 'improve-pipeline-design' into 'master'
Improve design of Pipeline view

## What does this MR do?

Improves current design of Pipelines view when there is multiple stages.
This makes the statuses clickable and makes the view more compact.

## Screenshots (if relevant)

![Screen_Shot_2016-05-21_at_01.20.40](/uploads/dd031b7af7005c7a61f3165fefa8b7c9/Screen_Shot_2016-05-21_at_01.20.40.png)

cc @DouweM @markpundsack @rspeicher @marin 

See merge request !4230
2016-06-02 13:20:51 +02:00
Yorick Peterse 85b4e06407 Added CHANGELOG entry for !3869 2016-06-02 13:20:23 +02:00
Jacob SchatzandYorick Peterse 9b09a94cc2 Merge branch 'fix-multiple-ci-status-poll' into 'master'
Fixed potential issue with 2 ci status polling events happening

Possible cause for double notifications was if the request was slow & then you changed page whilst this request was happening it would finish on another page & then launch another interval - this stops that issue.

Also passed in the CI status as an option value rather than waiting for the first ajax request to finish

See merge request !3869
2016-06-02 13:19:46 +02:00
Robert Speicher 8487770e0d Update CHANGELOG
[ci skip]
2016-05-25 15:51:10 -04:00
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