Commit Graph
28573 Commits
Author SHA1 Message Date
Fatih Acet aa2a7dad59 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into #15643
# Conflicts:
#	app/assets/stylesheets/pages/issuable.scss
2016-05-23 23:08:00 +03:00
Robert Speicher c002a560af Merge branch 'complexity/enable-multiple-rubocop-cops' into 'master'
Enable multiple Rubocop cops that can be enabled

See https://gitlab.com/gitlab-org/gitlab-ce/issues/17406

This enabled following cops:

```text
Lint/CircularArgumentReference:
  Description: Default values in optional keyword arguments and optional ordinal arguments
----------------
Lint/ConditionPosition:
  Description: Checks for condition placed in a confusing position relative to the keyword.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#same-line-condition
----------------
Lint/Debugger:
  Description: Check for debugger calls.
----------------
Lint/DefEndAlignment:
  Description: Align ends corresponding to defs correctly.
----------------
Lint/DuplicateMethods:
  Description: Check for duplicate method definitions.
----------------
Lint/DuplicatedKey:
  Description: Check for duplicate keys in hash literals.
----------------
Lint/EachWithObjectArgument:
  Description: Check for immutable argument given to each_with_object.
----------------
Lint/ElseLayout:
  Description: Check for odd code arrangement in an else block.
----------------
Lint/EmptyEnsure:
  Description: Checks for empty ensure block.
----------------
Lint/EmptyInterpolation:
  Description: Checks for empty string interpolation.
----------------
Lint/EndAlignment:
  Description: Align ends correctly.
----------------
Lint/EndInMethod:
  Description: END blocks should not be placed inside method definitions.
----------------
Lint/EnsureReturn:
  Description: Do not use return in an ensure block.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-return-ensure
----------------
Lint/Eval:
  Description: The use of eval represents a serious security risk.
----------------
Lint/FloatOutOfRange:
  Description: Catches floating-point literals too large or small for Ruby to represent.
----------------
Lint/FormatParameterMismatch:
  Description: The number of parameters to format/sprint must match the fields.
----------------
Lint/ImplicitStringConcatenation:
  Description: Checks for adjacent string literals on the same line, which could better
    be represented as a single string literal.
----------------
Lint/InvalidCharacterLiteral:
  Description: Checks for invalid character literals with a non-escaped whitespace character.
----------------
Lint/LiteralInInterpolation:
  Description: Checks for literals used in interpolation.
----------------
Lint/NestedMethodDefinition:
  Description: Do not use nested method definitions.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-methods
----------------
Lint/NextWithoutAccumulator:
  Description: Do not omit the accumulator when calling `next` in a `reduce`/`inject`
    block.
----------------
Lint/RandOne:
  Description: Checks for `rand(1)` calls. Such calls always return `0` and most likely
    a mistake.
----------------
Lint/RequireParentheses:
  Description: Use parentheses in the method call to avoid confusion about precedence.
----------------
Lint/UnreachableCode:
  Description: Unreachable code.
----------------
Lint/UselessComparison:
  Description: Checks for comparison of something with itself.
----------------
Lint/UselessElseWithoutRescue:
  Description: Checks for useless `else` in `begin..end` without `rescue`.
----------------
Lint/UselessSetterCall:
  Description: Checks for useless setter call to a local variable.
----------------
Lint/Void:
  Description: Possible use of operator/literal/variable in void context.
----------------
Performance/DoubleStartEndWith:
  Description: Use `str.{start,end}_with?(x, ..., y, ...)` instead of `str.{start,end}_with?(x,
    ...) || str.{start,end}_with?(y, ...)`.
----------------
Performance/RedundantSortBy:
  Description: Use `sort` instead of `sort_by { |x| x }`.
----------------
Rails/FindBy:
  Description: Prefer find_by over where.first.
  Include:
  - app/models/**/*.rb
----------------
Rails/FindEach:
  Description: Prefer all.find_each over all.find.
  Include:
  - app/models/**/*.rb
----------------
Rails/PluralizationGrammar:
  Description: Checks for incorrect grammar when using methods like `3.day.ago`.
----------------
Rails/ScopeArgs:
  Description: Checks the arguments of ActiveRecord scopes.
  Include:
  - app/models/**/*.rb
```

See merge request !4261
2016-05-23 19:39:34 +00:00
Robert Speicher 18ac02a3fe Merge branch 'rs-space-around-keyword' into 'master'
Enable Style/SpaceAroundKeyword cop and fix offenses

Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478

See merge request !4259
2016-05-23 19:29:25 +00:00
Robert Speicher 206e8344b8 Merge branch 'rs-update-rubocop' into 'master'
Update rubocop to 0.40.0

See merge request !4258
2016-05-23 19:27:25 +00:00
Robert Speicher 165834b373 Merge branch 'complexity/rubocop-style-loop' into 'master'
Enable Style/InfiniteLoop Rubocop cop

This MR enabled Style/InfiniteLoop Rubocop cop, and fixes offenses.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/17478

See merge request !4257
2016-05-23 18:47:05 +00:00
Grzegorz Bizon da5943fc95 Enabled multiple Rubocop cops that can be enabled
This enables multiple Rubocop cops that already conform to our codebase
and do not require fixes.
2016-05-23 20:32:19 +02:00
Robert Speicher 42aca7df08 Merge branch 'rs-range-include' into 'master'
Enable Performance/RangeInclude cop and fix single offense

Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478

See merge request !4255
2016-05-23 18:25:47 +00:00
Robert Speicher 3ba72f69af Enable Style/SpaceAroundKeyword cop and fix offenses 2016-05-23 14:16:35 -04:00
Robert Speicher d3fd58570c Merge branch 'rs-start-with' into 'master'
Enable Performance/StartWith cop and fix offenses

Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478

See merge request !4256
2016-05-23 18:13:08 +00:00
Robert Speicher 6898087b97 Update rubocop to 0.40.0 2016-05-23 14:03:04 -04:00
Jacob Schatz e491056e95 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-23 17:55:05 +00:00
Robert Speicher 74ce3faa1b Merge branch 'rs-def-with-parenthesis' into 'master'
Enable Style/DefWithParentheses cop and fix single offense

Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478

See merge request !4254
2016-05-23 17:52:52 +00:00
Grzegorz Bizon 17eaecd6c7 Enable Style/InfiniteLoop Rubocop cop 2016-05-23 19:50:31 +02:00
Achilleas Pipinellis 68b8e86a81 Merge branch 'container-registry-user-docs' into 'master'
Initial version of user documentation of container registry

cc @axil


See merge request !4244
2016-05-23 17:38:13 +00:00
Achilleas Pipinellis c49f5f7335 Copyedit Registry user docs 2016-05-23 12:31:52 -05:00
Robert Speicher 2de1109da3 Enable Performance/StartWith cop and fix offenses 2016-05-23 13:21:02 -04:00
Robert Speicher 51c167eeb7 Enable Performance/RangeInclude cop and fix single offense 2016-05-23 13:10:42 -04:00
Robert Speicher 013bccbd93 Enable Style/DefWithParentheses cop and fix single offense 2016-05-23 13:06:36 -04:00
Annabel Dunstone e8f869f96b Revert commit info change 2016-05-23 12:04:55 -05:00
Robert Speicher bc806831e8 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-23 16:55:59 +00:00
Achilleas Pipinellis 526da93052 Fix link to container Registry user docs 2016-05-23 11:47:19 -05:00
Robert Speicher cc7f3848c5 Merge branch 'gitlab-workhorse-0.7.3' into 'master'
Use gitlab-workhorse 0.7.3

Relax workhorse listen socket permissions.

See merge request !4252
2016-05-23 16:09:24 +00:00
Annabel Dunstone 27a5a4e430 Put column headers back 2016-05-23 09:46:06 -05:00
Jacob Vosmaer 3fa32fa2d5 Use gitlab-workhorse 0.7.3 2016-05-23 16:36:00 +02:00
Annabel Dunstone 9c1b3d88db Move build info out of pipeline conditional 2016-05-23 09:30:54 -05:00
Annabel Dunstone 85031223cd Move tags into column 2016-05-23 08:47:25 -05:00
Jacob Schatz 00fa9a769d 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-23 11:16:48 +00:00
Phil Hughes d3bdbf55c7 Fixed issue with dropdown not opening after removing due date 2016-05-23 09:33:48 +01:00
Phil Hughes 9052ec8d37 Added due date tests 2016-05-23 08:40:04 +01:00
Phil Hughes a69ab104de Added remove due date button
In the sidebar when there is a due date, a link to remove due date becomes visible

Closes #17392
2016-05-23 08:40:04 +01:00
Stan Hu 9bb0d0b407 Fix Error 500 in CI charts by gracefully handling commits with no durations
Closes #17730
2016-05-22 23:52:50 -07:00
Stan Hu 53ad33e4ba 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-23 06:27:46 +00:00
Grzegorz BizonandStan Hu a006ff74c7 Serialize application setting as Array by default 2016-05-22 22:31:28 -07:00
Kamil Trzcinski 8ed9b6aa7a Initial version of user documentation of container registry 2016-05-22 23:12:32 -05:00
Robert Speicher c135a69a87 Update CHANGELOG for 8.8.1. Again.
[ci skip]
2016-05-22 23:54:29 -04:00
Robert Speicher f23facabe4 Update CHANGELOG for 8.8.1
[ci skip]
2016-05-22 23:39:49 -04:00
Robert Speicher 3c18a4f8aa Merge branch 'fix-y2k17-problem' into 'master'
Fix some specs which would have broken in 2017 to not break anymore by using a dynamic year value.

Static year values would have caused the test suite to fail on these in the future, so I replaced 'em.

That's pretty much all there is to this MR.

See merge request !4241
2016-05-23 02:47:01 +00:00
Achilleas Pipinellis 399d5e723a 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-23 01:52:37 +00:00
Connor Shea 2bf818c4d0 Fix some specs which would have broken in 2017 to not break anymore by using a dynamic year value. 2016-05-22 19:50:49 -06:00
Achilleas Pipinellis c01f99b768 Fixes suggested by Kamil 2016-05-22 19:53:19 -05:00
Robert Speicher b0e12290ab 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-23 00:41:50 +00:00
Achilleas Pipinellis f896a4e0c1 Refactor storage location section 2016-05-22 19:34:52 -05:00
Achilleas Pipinellis f55f628531 Add note about port needed in NGINX config 2016-05-22 19:20:28 -05:00
Achilleas Pipinellis b565cfa50f Fix remaining docs on enabling/disabling Registry 2016-05-22 18:52:42 -05:00
Grzegorz Bizon 11fa89dfa5 Move Changelog for pipeline fix to valid version 2016-05-23 01:31:51 +02:00
Kamil TrzcinskiandGrzegorz Bizon cd26cfbc27 Allow anonymous user to access pipelines 2016-05-23 01:31:51 +02:00
Stan Hu 243e9bc0d9 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 23:24:18 +00:00
Robert Speicher ccafa78586 Merge branch 'upgrade-activerecord-session-store' into 'master'
Upgrade activerecord-session_store from 0.1.2 to 1.0.0.

Changelog: https://github.com/rails/activerecord-session_store/releases/tag/v1.0.0

Includes Rails 5 support, working towards the never-ending #14286.

See merge request !4238
2016-05-22 22:40:49 +00:00
Grzegorz Bizon edfb20f2bc Move registry fix Changelog entry to valid version 2016-05-23 00:34:52 +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