home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,701 Commits 48 Branches 340 Tags
f96127bc2c9d9b711960cc2ea4cb4f2ffde5cfcb
Commit Graph
28701 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan f96127bc2c Merge branch 'rs-remove-issue_to_atom' into 'master' 
Remove `issue_to_atom` helper



See merge request !4265
 2016-05-25 20:51:53 +00:00
Douwe Maan c1167be283 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-05-25 20:50:26 +00:00
Douwe Maan fb11004d5e Merge branch 'rs-event-atom-partial' into 'master' 
Remove `event_to_atom` helper



See merge request !4234
 2016-05-25 20:49:26 +00:00
Douwe Maan 99cd419132 Merge branch 'fix/import-url-uri-issue' into 'master' 
Fix for import URL URI problem when URL contains a space

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

Prevents an already encoded URL to be encoded again - preventing %20 => %25%20

See merge request !4180
 2016-05-25 20:48:30 +00:00
Douwe Maan 74fb500415 Merge branch 'issue_10725' into 'master' 
Fix forks creation when visibility level is restricted

fixes #10725

See merge request !4283
 2016-05-25 20:47:46 +00:00
Robert Speicher 380966e861 Merge branch 'zero-project-creation-error-message' into 'master' 
Updated error message when project limit is zero

When the project limit is zero & the user tries to create a project, the
error displayed is now 'Personal project creation is not allowed. Please
contact your administrator with questions'

Closes #17691

See merge request !4280
 2016-05-25 20:38:14 +00:00
Jacob Schatz 49343f9a31 Merge branch 'closed-by-alignment' into 'master' 
Related merge request text alignment

Fixed the alignment of the text 'When this merge request is accepted...' on issues page

![Screen_Shot_2016-05-23_at_14.59.48](/uploads/5d2f4be94108364a9d004169a6825a9e/Screen_Shot_2016-05-23_at_14.59.48.png)

See merge request !4251
 2016-05-25 20:25:10 +00:00
Robert Speicher 7fa1ab469f Merge remote-tracking branch 'github/master' into 'master' 2016-05-25 16:13:57 -04:00
Robert Speicher 19cb7241ea Update CHANGELOG for 8.8.2 
[ci skip]
 2016-05-25 16:05:57 -04:00
Jacob Schatz 42e55585bb Merge branch 'dz-improve-ui-guide' into 'master' 
Write some thoughts to the UI guide

cc @skyruler 

See merge request !4290
 2016-05-25 19:55:14 +00:00
Jacob Schatz 0cc060bc5f Merge branch 'issue-filter-name-options' into 'master' 
Issuable filtering improvements

This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests.

Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both. Fixes #4252 

Fixed issue with not being able to filter and sort issues without refreshing the page. Fixes #15269 

See merge request !3699
 2016-05-25 19:44:06 +00:00
Robert Speicher 3c2d0cf24c Merge branch 'complexity/enable-multiple-rubocop-cops-2' into 'master' 
Enable multiple compatible Rubocop cops

## What does this MR do?

This MR enables multiple Rubocop cops, that are already compatible with
our codebase. See #17406.

Cops enabled:

```text
Style/ArrayJoin:
  Description: Use Array#join instead of Array#*.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#array-join
----------------
Style/Attr:
  Description: Checks for uses of Module#attr.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#attr
----------------
Style/BlockComments:
  Description: Do not use block comments.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-block-comments
----------------
Style/ClassMethods:
  Description: Use self when defining module/class methods.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#def-self-class-methods
----------------
Style/EndBlock:
  Description: Avoid the use of END blocks.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-END-blocks
----------------
Style/EvenOdd:
  Description: Favor the use of Fixnum#even? && Fixnum#odd?
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#predicate-methods
----------------
Style/FileName:
  Description: Use snake_case for source file names.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files
  ExpectMatchingDefinition: false
----------------
Style/FirstMethodParameterLineBreak:
  Description: Checks for a line break before the first parameter in a multi-line method
    parameter definition.
----------------
Style/FlipFlop:
  Description: Checks for flip flops
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-flip-flops
----------------
Style/GlobalVars:
  Description: Do not introduce global variables.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#instance-vars
  Reference: http://www.zenspider.com/Languages/Ruby/QuickRef.html
----------------
Style/IfWithSemicolon:
  Description: Do not use if x; .... Use the ternary operator instead.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-semicolon-ifs
----------------
Style/LambdaCall:
  Description: Use lambda.call(...) instead of lambda.(...).
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#proc-call
  EnforcedStyle: call
----------------
Style/MethodName:
  Description: Use the configured style when naming methods.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-symbols-methods-vars
  EnforcedStyle: snake_case
----------------
Style/MultilineMethodDefinitionBraceLayout:
  Description: Checks that the closing brace in a method definition is symmetrical with
    respect to the opening brace and the method parameters.
----------------
Style/NestedModifier:
  Description: Avoid using nested modifiers.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-modifiers
----------------
Style/OpMethod:
  Description: When defining binary operators, name the argument other.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#other-arg
----------------
Style/SignalException:
  Description: Checks for proper usage of fail and raise.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#prefer-raise-over-fail
  EnforcedStyle: only_raise
----------------
Style/SpaceAfterNot:
  Description: Tracks redundant space after the ! operator.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-space-bang
----------------
Style/SpaceBeforeSemicolon:
  Description: No spaces before semicolons.
----------------
Style/SpaceInsideRangeLiteral:
  Description: No spaces inside range literals.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-space-inside-range-literals
----------------
Style/SpaceInsideStringInterpolation:
  Description: Checks for padding/surrounding spaces inside string interpolation.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#string-interpolation
  EnforcedStyle: no_space
----------------
Style/StabbyLambdaParentheses:
  Description: Check for the usage of parentheses around stabby lambda arguments.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#stabby-lambda-with-args
  EnforcedStyle: require_parentheses
----------------
Style/StringMethods:
  Description: Checks if configured preferred methods are used over non-preferred.
  PreferredMethods:
    intern: to_sym
----------------
Style/VariableInterpolation:
  Description: Don't interpolate global, instance and class variables directly in strings.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#curlies-interpolate
----------------
Style/VariableName:
  Description: Use the configured style when naming variables.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-symbols-methods-vars
  EnforcedStyle: snake_case
----------------
Style/WhenThen:
  Description: Use when x then ... for one-line cases.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#one-line-cases
----------------
Style/WhileUntilModifier:
  Description: Favor modifier while/until usage when you have a single-line body.
  StyleGuide: https://github.com/bbatsov/ruby-style-guide#while-as-a-modifier
  MaxLineLength: 80
```

Closes #17406 

See merge request !4286
 2016-05-25 19:41:10 +00:00
Jacob Schatz b21e234b11 Merge branch 'gitlab-import-status' into 'master' 
Fixed issue with GitLab import buttons having a spinner

![import](/uploads/db635f1d62affefca027d5fd4f545cd1/import.gif)

Closes #17232

See merge request !4276
 2016-05-25 19:40:17 +00:00
Robert Speicher 091437706b Merge branch 'db-configure-rake-task' into 'master' 
Add a gitlab:db:configure rake task to handle conditionally seeding or
migrating the database.

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

See merge request !4062
 2016-05-25 19:35:24 +00:00
Jacob Schatz 8bb8dd39d6 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-05-25 19:34:27 +00:00
Robert Speicher 501a2d12e7 Remove unneeded indentation from RuboCop config 
[ci skip]
 2016-05-25 15:27:20 -04:00
Jacob Schatz 891c94852d Merge branch 'fix-grammar-issues' into 'master' 
Fix grammar and wording in text on various pages.

## What does this MR do?

Fixes various grammatical and/or wording issues I found while copyediting on the plane :)

## Why was this MR needed?

Incorrect grammar and weird/confusing wording makes the product look less polished and professional.

See merge request !4237
 2016-05-25 19:26:22 +00:00
Robert Speicher 2c89d6664a Merge pull request #10338 from donhui/patch-1 
Fix typo in HA documentation

[ci skip]
 2016-05-25 15:18:00 -04:00
Jacob Schatz 16817cc49f Fix the english. 2016-05-25 14:57:15 -04:00
Dmitriy Zaporozhets f7da994cfd Write some thoughts to the UI guide 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-25 20:44:02 +02:00
Jacob Schatz 820470af54 Merge branch 'layout-nav-zindex' into 'master' 
Increased zindex of layout nav

This fixes issues where group inputs would be above the dropdown in the nav

![Screen_Shot_2016-05-17_at_10.14.18](/uploads/08e4a43922051c28377ae6f34725ccc6/Screen_Shot_2016-05-17_at_10.14.18.png)

Closes #17524

See merge request !4176
 2016-05-25 17:47:50 +00:00
DJ Mountney 1a7326ba9a Switch the gitlab:db:configure task to use tables.any? instead of looking specifically for the schema_migrations table 2016-05-25 10:47:09 -07:00
DJ Mountney 40d4d8a4e7 Add tests for the gitlab:db:configure rake task 2016-05-25 10:44:22 -07:00
DJ Mountney 24632d2150 Update hash syntax and add changelog for the gitlab:db:configure rake task 2016-05-25 10:44:22 -07:00
DJ Mountney c6e7d826b2 Add a gitlab:db:configure rake task to handle conditionally seeding or migrating the database. 2016-05-25 10:44:22 -07:00
Dmitriy Zaporozhets c04f85a333 Merge branch 'rs-rubocop-nottonot' into 'master' 
Enable RSpec/NotToNot cop and auto-correct offenses

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

See merge request !4267
 2016-05-25 16:46:29 +00:00
Felipe Artur 5273335247 Fix forks creation when visibility level is restricted 2016-05-25 10:57:00 -04:00
Jacob Schatz f68f837d87 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-05-25 14:28:42 +00:00
Alfredo SumaranandJacob Schatz 9a10205a4f Reduce spacing 2016-05-25 08:15:20 -04:00
Alfredo SumaranandJacob Schatz 0f63d34447 Remove conditional 2016-05-25 08:15:20 -04:00
Alfredo SumaranandJacob Schatz da14205b61 Update CHANGELOG 2016-05-25 08:15:20 -04:00
Alfredo SumaranandJacob Schatz 77ca4a675a Make conditional a guard clause 2016-05-25 08:15:20 -04:00
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
Phil Hughes 1e45fb2f2d Fixed issue with button color when no CI enabled 
Closes #17844
 2016-05-25 11:08:00 +01: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
Phil Hughes 497a28c59f Fixed project model tests 2016-05-25 09:44:33 +01: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
Phil Hughes 56c00d1ce3 Increased zindex of layout nav 
This fixes issues where group inputs would be above the dropdown in the nav

Closes #17524
 2016-05-25 08:43:58 +01:00
Grzegorz Bizon 2c7439db4d Enable multiple compatible Rubocop cops 
Closes #17406
 2016-05-25 06:17:29 +02:00
Kamil Trzcinski 718fe268c4 Improve after review 2016-05-24 22:52:31 -05:00