Commit Graph
28591 Commits
Author SHA1 Message Date
Kamil Trzcinski cdec9e472d Replace \n to <br> 2016-05-23 21:59:07 -05:00
Kamil Trzcinski 46de0366b1 Fix concurrent request when updating build log in browser 2016-05-23 20:57:03 -05:00
Dmitriy Zaporozhets 16ca3ee636 Merge branch 'project-navigation-redesign' into 'master'
Project navigation redesign

Based on !3980. Part of #14838. This MR targets on desktop version. Mobile version improvements will be in separate merge request.

Part of #17522

cc @jschatz1 

See merge request !4053
2016-05-23 23:31:06 +00:00
Dmitriy Zaporozhets 510b5c5f39 Move files tab before commits tab to follow same order as top navigation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-24 00:41:31 +02:00
Dmitriy Zaporozhets f34a9f17ba Fix badge count UI for pipelines menu item
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-24 00:41:07 +02:00
Dmitriy Zaporozhets 3d4ef74d36 Use start_with? instead of regex
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-24 00:23:23 +02:00
Dmitriy Zaporozhets 438b186a99 Merge branch 'rs-rubocop-rspec' into 'master'
Add rubocop-rspec

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

See merge request !4264
2016-05-23 22:21:30 +00:00
Dmitriy Zaporozhets 2f1828a981 Add changelog item for project navigation UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-23 22:42:05 +02:00
Dmitriy Zaporozhets 2f4dc1ee16 Merge branch 'master' into project-navigation-redesign 2016-05-23 22:41:11 +02:00
Robert Speicher b62f4b69d1 Merge branch 'version-bump-8-9-pre' into 'master'
Its time for 8.9

See merge request !4262
2016-05-23 20:29:24 +00:00
Robert Speicher 87195b9ae4 Add descriptive comments for rubocop-rspec cops
[ci skip]
2016-05-23 16:20:53 -04:00
Robert Speicher 43d9e06b68 Add rubocop-rspec
Almost all cops are starting as disabled until we can fix their
violations.
2016-05-23 15:59:32 -04: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
Dmitriy Zaporozhets c6f5af1985 Its time for 8.9
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-23 20:51:42 +02: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
Annabel Dunstone 75532a6570 Change rgba to hex; use sass variables to calculate header height 2016-05-23 12:54:04 -05: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