Commit Graph
28633 Commits
Author SHA1 Message Date
Alfredo SumaranandJacob Schatz bc38bfada7 Update CHANGELOG 2016-05-25 08:15:20 -04:00
Alfredo SumaranandJacob Schatz fd0c40fc80 Address feedback
Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
2016-05-25 08:15:20 -04:00
Alfredo SumaranandJacob Schatz 7d7ded5ee9 Update CHANGELOG 2016-05-25 08:15:20 -04:00
Alfredo SumaranandJacob Schatz 2c8000e302 Move conditional to a method 2016-05-25 08:15:20 -04:00
Alfredo SumaranandJacob Schatz 7586807fc3 Fix syntax 2016-05-25 08:15:20 -04:00
Alfredo SumaranandJacob Schatz 76697c9b1b Update CHANGELOG 2016-05-25 08:15:20 -04:00
Alfredo SumaranandJacob Schatz 2d810b61ad Move todo target state to the top and fix styles on mobile 2016-05-25 08:15:20 -04:00
Alfredo SumaranandJacob Schatz 38d6bc77f9 Add tests for Todos target's state 2016-05-25 08:15:20 -04:00
Alfredo SumaranandJacob Schatz 33be8181ac Add target status 2016-05-25 08:15:20 -04:00
Douwe Maan 5fb1de3426 Merge branch 'issue_15221_2' 2016-05-25 14:09:57 +02:00
Jacob Schatz 318b22459b 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 11:51:20 +00:00
Douwe Maan 019a3c781e 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 09:28:22 +00:00
Jeroen van Baarsen 4618e538be Merge branch 'plural-second-slack' into 'master'
Changed the Slack build message to use the singular duration if necessary

## What does this MR do?

Previously, the Slack build notification would say "second(s)" even when the duration was only 1 second. This MR fixes that. This is my first time writing Ruby code and my first MR on Gitlab, so feedback is very much appreciated!

See merge request !4253
2016-05-25 07:58:33 +00:00
Kamil Trzcinski 718fe268c4 Improve after review 2016-05-24 22:52:31 -05:00
Stan Hu fbef0cc90d Merge branch 'master' into 'master'
Update health_check.md - Fix spelling of admin/health_check path.  [ci skip]

## What does this MR do?
Fix the spelling of admin/heath_check to admin/health_check in health_check documentation

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

## Why was this MR needed?
Fix a spelling error that may mislead a user on the proper URL/Path to check the GitLab health.

## What are the relevant issue numbers?

## Screenshots (if relevant)

See merge request !4282
2016-05-24 21:43:46 +00:00
Jacob Schatz d6e5299fb6 Merge branch 'snippets-ui' into 'master'
Updated snippets UI

![Screen_Shot_2016-05-18_at_14.11.54](/uploads/2544351e50f19a36c4ba9a7a92d5544b/Screen_Shot_2016-05-18_at_14.11.54.png)

Closes #14328

See merge request !4194
2016-05-24 21:15:19 +00:00
Jacob Schatz 05323a7855 Merge branch 'project-settings' into 'master'
Project settings UI update

![Screen_Shot_2016-05-16_at_16.42.55](/uploads/2e308cbf26a002fc411c3e84b663a5d1/Screen_Shot_2016-05-16_at_16.42.55.png)![Screen_Shot_2016-05-16_at_16.43.01](/uploads/8d983c43307c65852efe002f6e9482d9/Screen_Shot_2016-05-16_at_16.43.01.png)![Screen_Shot_2016-05-16_at_16.43.16](/uploads/6124e0600cc0e5b309a60b065409d537/Screen_Shot_2016-05-16_at_16.43.16.png)![Screen_Shot_2016-05-16_at_16.43.13](/uploads/177976c2c08034e096e7ebdcad1f369f/Screen_Shot_2016-05-16_at_16.43.13.png)

See merge request !4162
2016-05-24 21:11:30 +00:00
Ryan Rustong 810d0bf313 Update health_check.md - Fix spelling of admin/health_check path. [ci skip] 2016-05-24 20:53:27 +00:00
Felipe Artur dac9b4212d Fix outer join when filtering milestones 2016-05-24 16:51:43 -04:00
Jacob Schatz c00ba9a632 Merge branch 'scroll-to-changes-content' into 'master'
Clicking changes tab scrolls the window to show the content

When you click on the changes tab in a merge request, it will now scroll the window down to the content.

![scroll](/uploads/c5db23e1c32b1fe62bf4efb815b3f055/scroll.gif)

Closes #15133

See merge request !4192
2016-05-24 20:51:25 +00:00
Felipe Artur 45e516b817 Fix bug when ordering by milestone due date and filtering by milestone 2016-05-24 16:49:15 -04:00
Felipe Artur 3b2223f116 improve ordering sql for milestones 2016-05-24 16:49:15 -04:00
Felipe Artur 673196e0a8 Fix ordering for Mysql 2016-05-24 16:49:15 -04:00
Felipe Artur 996240a489 Fix issues/MRs filter when ordering by milestone due date 2016-05-24 16:49:15 -04:00
Robert Speicher 28dbf9317b 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-24 19:28:15 +00:00
Robert Speicher a9b431c5b9 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-24 19:21:36 +00:00
sebastian-schmid 12cf4f885a fixing typo in link #17809 2016-05-24 20:26:43 +02:00
Florian Preinstorfer 07a3b09b76 Update branch name from 8-7-stable to 8-8-stable 2016-05-24 10:17:40 +00:00
Aran Koning fcd723eda6 Seconds plural slack 2016-05-24 10:54:16 +02:00
Stan Hu baa9c66057 Merge branch 'gitlab-shell-changelog' into 'master'
Add CHANGELOG entry about using gitlab-shell v3.0.0



See merge request !4272
2016-05-24 07:35:17 +00:00
Stan Hu 97c904a322 Add CHANGELOG entry about using gitlab-shell v3.0.0
[ci skip]
2016-05-24 00:33:47 -07:00
Stan Hu 3b10a44f47 Merge branch 'gitlab-shell-v3.0.0' into 'master'
Use gitlab-shell 3.0.0

Update gitlab-shell to v3.0.0 as discussed in https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/59

See merge request !4246
2016-05-24 07:18:01 +00:00
Achilleas Pipinellis fd5cd637dd Merge branch 'mrchrisw/google-api' into 'master'
Update Google integration API workflow

## What does this MR do?

Updates the Google API workflow.

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

No

## Why was this MR needed?

Reported by a user

https://gitlab.zendesk.com/agent/tickets/24402

## Screenshots (if relevant)

![image](/uploads/6b1cf71ebc09589c05290575e0c8ea23/image.png)

See merge request !4260
2016-05-24 06:59:39 +00:00
Kamil Trzcinski 24ef7063be Update CHANGELOG 2016-05-23 21:59:08 -05:00
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
Kamil Trzcinski 12bd781031 Fix backups if registry is disabled 2016-05-23 14:18:39 -05:00