Commit Graph
28906 Commits
Author SHA1 Message Date
Rémy Coutable ea80259b48 Don't advertise the use of "ci skip" in the CONTRIBUTING guide
Now that we autoscale runner, we don't need to optimize for their usage
anymore. Abusing of "ci skip", for instance for view changes can lead to
broken specs, so let's just not use it!

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-01 14:18:37 +02:00
Rémy Coutable adcbd00135 Merge branch 'doc_api_services_jira_amend' into 'master'
Amend jira service api docs [ci skip]

## What does this MR do?

Amends the API documentation for jira service integration

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

No

## Why was this MR needed?

The current documentation omits the username and password parameters

## What are the relevant issue numbers?

## Screenshots (if relevant)

See merge request !4382
2016-06-01 09:09:37 +00:00
Rémy Coutable 46ac3107a4 Merge branch 'issue_15557' into 'master'
Fix error 500 when sorting issues by milestone due date and filtering by labels

fixes #15557 

See merge request !4327
2016-06-01 08:42:36 +00:00
Dmitriy Zaporozhets cb261abee1 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-06-01 11:34:45 +03:00
Dmitriy Zaporozhets 8959de25d7 Merge branch 'rs-event-common-has-tooltip' into 'master'
Add tooltips for common Event feed entries

This adds tooltips to the event target for events like "opened merge
request !XYZ"

After https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090#note_11712839, several references in the event feed had titles but were still missing tooltips.

See merge request !4371
2016-06-01 08:34:29 +00:00
Jacob Schatz 473ea1e974 Merge branch '17756-close-btn' into 'master'
New style for close buttons

## What does this MR do?
Adds new style for all `Close` buttons

## What are the relevant issue numbers?
Closes #17756 
## Screenshots (if relevant)   
<img src="/uploads/a1d4cb8c22facb4c170e9cf3b4ae439a/Screen_Shot_2016-05-31_at_2.26.42_PM.png" width="800px">   
<img src="/uploads/d567694d79ec6bd5da0ff2faf8b262b0/Screen_Shot_2016-05-31_at_2.26.09_PM.png" width="800px">   
<img src="/uploads/f5e23d8031427079a334d4e03da466b0/Screen_Shot_2016-05-31_at_2.29.01_PM.png" width="800px">   


cc @dzaporozhets 


See merge request !4388
2016-05-31 22:51:33 +00:00
Felipe Artur 56f3b243ce Add leading comment space cop 2016-05-31 19:33:46 -03:00
Robert Speicher 09a80feede Merge branch 'upgrade-kaminari' into 'master'
Upgrade Kaminari from 0.16.3 to 0.17.0.

Changelog: https://github.com/amatsuda/kaminari/blob/master/CHANGELOG.rdoc#0170

Deprecates `num_pages` in favor of `total_pages` and includes Rails 5 support.

Working towards #14286.

See merge request !4387
2016-05-31 21:07:57 +00:00
Stan Hu 873718aa7f Merge branch 'rs-create-remote-backup-folder' into 'master'
Create the specified remote directory during backup

This is idempotent, so there's no harm calling it if the directory
already exists.

Closes #12710

See merge request !4383
2016-05-31 20:56:21 +00:00
Annabel Dunstone 1648316eff New style for close buttons 2016-05-31 14:23:27 -06:00
Connor Shea 7f4f959e9b Upgrade Kaminari from 0.16.3 to 0.17.0.
Changelog: https://github.com/amatsuda/kaminari/blob/master/CHANGELOG.rdoc#0170

Deprecates num_pages in favor of total_pages and includes Rails 5 support.
2016-05-31 14:14:16 -06:00
Robert Speicher 613bcdc626 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-05-31 19:35:13 +00:00
Robert Speicher 4ec1b65bea Merge branch 'refactoring/improve-build-specs' into 'master'
Remove redundant factory namespace in build specs

Extracted from !4351.

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4351#note_12154604

See merge request !4373
2016-05-31 18:48:27 +00:00
Valery Sizov 9154586ce5 Confidential notes data leak 2016-05-31 21:32:53 +03: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
Robert Speicher b826c9ff17 Create the specified remote directory during backup
This is idempotent, so there's no harm calling it if the directory
already exists.

Closes #12710
2016-05-31 13:29:37 -04:00
Stan Hu e87149a12b Merge branch 'remove-dangling-notification-settings' into 'master'
Remove project notification settings associated with deleted projects

On GitLab.com, there are 1560 project notification settings with no valid project all created on 2016-04-15 10:38:53 for some reason. This migration should purge
those entries.
    
b8f38437 should prevent this issue from occurring in the first place.
    
Closes gitlab-com/support-forum#678


See merge request !4311
2016-05-31 16:51:04 +00:00
Richard Grainger 024227bdbf Amend jira service api docs [ci skip] 2016-05-31 17:28:20 +01:00
Stan Hu 4da0778157 Remove project notification settings associated with deleted projects
On GitLab.com, there are 1560 project notification settings with no valid project
all created on 2016-04-15 10:38:53 for some reason. This migration should purge
those entries.

b8f38437 should prevent this issue from occurring in the first place.

Closes gitlab-com/support-forum#678
2016-05-31 08:50:18 -07:00
Douwe Maan 5011eeb16e 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-05-31 15:23:54 +00:00
Gabriel Mazetto 6d16feef05 Add wiki page events fix to the Changelog 2016-05-31 12:07:01 -03:00
Gabriel Mazetto 04084996e5 Codestyle changes 2016-05-31 11:24:58 -03: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 000585be1b Remove update of container_registry_token_expire_delay
This is not needed when we specify a default.
2016-05-31 15:51:45 +02:00
Kamil Trzcinski f27daddfc6 Fix rubocop offenses 2016-05-31 15:38:42 +02:00
Felipe Artur 30e61ed79c Fix error 500 when sorting issues by milestone due date and filtering by labels 2016-05-31 10:35:57 -03:00
Kamil Trzcinski b1a21a9986 Set container_registry_token_expire_delay default to 5 2016-05-31 15:20:46 +02:00
Kamil Trzcinski f517aa49e1 Fix migration information 2016-05-31 13:49:48 +02:00
Kamil Trzcinski 7a6ba30d9a Test token expirability 2016-05-31 13:48:21 +02:00
Kamil Trzcinski 7b0e2bbc80 Fix the use of CurrentSettings in ContainerRegistryAuthenticationService 2016-05-31 13:48:05 +02:00
Robert Schilling ef4fedc18f Merge branch 'doc-upgrade-wrong-old-version' into 'master'
Update docs: previous version is 8.7

The old version is 8.7.

See merge request !4288
2016-05-31 11:38:12 +00:00
Kamil Trzcinski 041b021507 Update db/schema.rb 2016-05-31 13:27:09 +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
Rémy Coutable ba81c91255 Merge branch 'patch/wiki_page_events' into 'master'
Enable Wiki Page events from Webhook admin UI in a Project

* Added UI to enable page wiki events
* Documentation for this event in Webhooks page

Fixes #17506

--- 

![new_webhook_UI](/uploads/63ef24b4ccef13ac7a5fda83e9ce64ad/new_webhook_UI.png)

See merge request !4135
2016-05-31 08:34:38 +00:00
Grzegorz Bizon 2f1a229d15 Remove redundant factory namespace in build specs
Conflicts:
	spec/models/build_spec.rb
2016-05-31 10:03:39 +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
Robert Speicher 7c4acf0068 Add tooltips for common Event feed entries
This adds tooltips to the event target for events like "opened merge
request !XYZ"
2016-05-30 23:10:30 -04:00
Robert Speicher b5decabb00 Merge branch 'patch-1' into 'master'
Fix typo

Add missing "of" to CI YAML docs.

[ci skip]

See merge request !4331
2016-05-30 22:11:05 +00:00
Robert Speicher 38fa9e8f67 Merge branch 'docs-typo-fixes' into 'master'
Fix various documentation typos and spelling mistakes

[ci skip]

See merge request !4345
2016-05-30 21:36:13 +00:00
Robert Speicher f62133c641 Merge branch 'issue_18009' into 'master'
Add missing steps in update docs

Fixes #18009

[ci skip]

See merge request !4365
2016-05-30 21:31:01 +00:00
Gabriel Mazetto ab17e4b74f Small fixes and added to the changelog 2016-05-30 17:41:27 -03:00
Gabriel Mazetto 6506a9dd44 Added documentation to current Wiki Page event webhook 2016-05-30 16:12:50 -03:00
Gabriel Mazetto e3311178a3 Add Admin UI to enable Wiki Page events webhook in projects 2016-05-30 16:12:50 -03:00
Robert Speicher de20bd5b31 Merge branch 'rubocop/enable-space-before-comma-cop' into 'master'
Enable Style/SpaceBeforeComma rubocop cop

No spaces before commas.

See #17478

See merge request !4360
2016-05-30 18:22:48 +00:00
Robert Speicher b05981f019 Merge branch 'rubocop/enable-performance-times-map-cop' into 'master'
Enable Performance/TimesMap Rubocop cop

Use Array.new with a block instead of `.times.collect` / `.times.map`.

See #17478

See merge request !4357
2016-05-30 18:06:56 +00:00
Robert Speicher e7586cfbdc Merge branch 'rubocop/enable-negatedif-style-cop' into 'master'
Enable Style/NegatedIf Rubocop cop

Favor `unless` over `if` for negative conditions (or control flow ||).

```ruby
# bad
do_something if !some_condition
# bad
do_something if not some_condition

# good
do_something unless some_condition
# good
some_condition || do_something
```

See #17478

See merge request !4355
2016-05-30 17:59:10 +00:00
Robert Speicher ea32937630 Merge branch 'rubocop/enable-literal-in-condition-cop' into 'master'
Enable Lint/LiteralInCondition rubocop cop

Detects literals used in conditions.

See #17478

See merge request !4354
2016-05-30 17:56:15 +00:00
Robert Speicher 7a6d069f41 Merge branch 'style/enable-multiline-if-then-rubocop-cop' into 'master'
Enable Style/MultilineIfThen rubocop cop

Do not use then for multi-line if.

See #7478.

See merge request !4353
2016-05-30 17:47:59 +00:00
Robert Speicher 1a59b350d8 Merge branch 'style/enable-method-def-parentheses-rubocop-cop' into 'master'
Enable Style/MethodDefParentheses rubocop cop

Use def with parentheses when there are parameters.

See #17478

See merge request !4352
2016-05-30 17:46:22 +00:00
Robert Speicher a8e80d4a59 Merge branch 'style/enable-rubocop-indent-assignment-cop' into 'master'
Enable Style/IndentAssignment Rubocop style cop

Checks the indentation of the first line of the right-hand-side of a multi-line assignment.

See #17478

See merge request !4348
2016-05-30 17:41:43 +00:00