summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove main_language and testsremove-main-languageJosh Frye2016-05-258-84/+23
|
* Merge branch 'closed-by-alignment' into 'master' Jacob Schatz2016-05-252-6/+4
|\ | | | | | | | | | | | | | | | | 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
| * Related merge request text alignmentclosed-by-alignmentPhil Hughes2016-05-232-6/+4
| |
* | Merge remote-tracking branch 'github/master' into 'master'Robert Speicher2016-05-251-1/+1
|\ \
| * \ Merge pull request #10338 from donhui/patch-1Robert Speicher2016-05-251-1/+1
| |\ \ | | | | | | | | | | | | | | | | Fix typo in HA documentation [ci skip]
| | * | typo fix: # Disable all components except Redisdonhui2016-05-161-1/+1
| | | | | | | | | | | | typo fix: # Disable all components except Redis
* | | | Update CHANGELOG for 8.8.2Robert Speicher2016-05-251-5/+11
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'dz-improve-ui-guide' into 'master' Jacob Schatz2016-05-251-0/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write some thoughts to the UI guide cc @skyruler See merge request !4290
| * | | | Fix the english.Jacob Schatz2016-05-251-19/+14
| | | | |
| * | | | Write some thoughts to the UI guideDmitriy Zaporozhets2016-05-251-0/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'issue-filter-name-options' into 'master' Jacob Schatz2016-05-2511-71/+203
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Updated Ruby based on feedbackissue-filter-name-optionsPhil Hughes2016-05-243-20/+11
| | | | | |
| * | | | | Fixed up JS commentsPhil Hughes2016-05-202-5/+4
| | | | | |
| * | | | | Fixed issue with not being able to search text & filterPhil Hughes2016-05-162-2/+11
| | | | | |
| * | | | | Fixed failing rubocop testsPhil Hughes2016-05-163-41/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with issuable checkboxs not being init'd
| * | | | | Added issue_search parameterPhil Hughes2016-05-161-1/+1
| | | | | |
| * | | | | Fixed testsPhil Hughes2016-05-163-15/+5
| | | | | |
| * | | | | Fixed issue with not being able to sort and filterPhil Hughes2016-05-163-3/+47
| | | | | |
| * | | | | Added testsPhil Hughes2016-05-161-0/+106
| | | | | |
| * | | | | Fixed Ruby issuesPhil Hughes2016-05-161-2/+1
| | | | | |
| * | | | | Issuable filtering improvementsPhil Hughes2016-05-168-23/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'complexity/enable-multiple-rubocop-cops-2' into 'master' Robert Speicher2016-05-252-27/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Remove unneeded indentation from RuboCop configRobert Speicher2016-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Enable multiple compatible Rubocop copscomplexity/enable-multiple-rubocop-cops-2Grzegorz Bizon2016-05-252-27/+43
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Closes #17406
* | | | | | Merge branch 'gitlab-import-status' into 'master' Jacob Schatz2016-05-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with GitLab import buttons having a spinner ![import](/uploads/db635f1d62affefca027d5fd4f545cd1/import.gif) Closes #17232 See merge request !4276
| * | | | | | Fixed issue with GitLab import buttons having a spinnergitlab-import-statusPhil Hughes2016-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #17232
* | | | | | | Merge branch 'db-configure-rake-task' into 'master' Robert Speicher2016-05-253-0/+73
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Switch the gitlab:db:configure task to use tables.any? instead of looking ↵DJ Mountney2016-05-253-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specifically for the schema_migrations table
| * | | | | | | Add tests for the gitlab:db:configure rake taskDJ Mountney2016-05-251-0/+62
| | | | | | | |
| * | | | | | | Update hash syntax and add changelog for the gitlab:db:configure rake taskDJ Mountney2016-05-252-2/+2
| | | | | | | |
| * | | | | | | Add a gitlab:db:configure rake task to handle conditionally seeding or ↵DJ Mountney2016-05-251-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migrating the database.
* | | | | | | | Merge branch 'generic-commit-status' into 'master' Jacob Schatz2016-05-251-7/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Move tags to column in generic_commit_statusgeneric-commit-statusAnnabel Dunstone2016-05-241-7/+7
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-grammar-issues' into 'master' Jacob Schatz2016-05-257-18/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Resolve some issues Jacob brought up.Connor Shea2016-05-242-7/+7
| | | | | | | | |
| * | | | | | | | Fix grammar and wording in text on various pages.Connor Shea2016-05-227-20/+18
| | | | | | | | |
* | | | | | | | | Merge branch 'layout-nav-zindex' into 'master' Jacob Schatz2016-05-251-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Increased zindex of layout navlayout-nav-zindexPhil Hughes2016-05-251-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes issues where group inputs would be above the dropdown in the nav Closes #17524
* | | | | | | | Merge branch 'rs-rubocop-nottonot' into 'master' Dmitriy Zaporozhets2016-05-2565-117/+117
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable RSpec/NotToNot cop and auto-correct offenses Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17761 See merge request !4267
| * | | | | | | | Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonotRobert Speicher2016-05-2465-117/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removes the note from the development/testing.md guide
* | | | | | | | | Merge branch 'merge-button-color-fix' into 'master' Jacob Schatz2016-05-252-3/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Fixed issue with button color when no CI enabledmerge-button-color-fixPhil Hughes2016-05-252-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #17844
* | | | | | | | | | Reduce spacingissue_15347Alfredo Sumaran2016-05-251-3/+3
| | | | | | | | | |
* | | | | | | | | | Remove conditionalAlfredo Sumaran2016-05-251-2/+1
| | | | | | | | | |
* | | | | | | | | | Update CHANGELOGAlfredo Sumaran2016-05-251-4/+1
| | | | | | | | | |
* | | | | | | | | | Make conditional a guard clauseAlfredo Sumaran2016-05-251-5/+5
| | | | | | | | | |
* | | | | | | | | | Update CHANGELOGAlfredo Sumaran2016-05-251-1/+1
| | | | | | | | | |
* | | | | | | | | | Address feedbackAlfredo Sumaran2016-05-255-96/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
* | | | | | | | | | Update CHANGELOGAlfredo Sumaran2016-05-251-1/+1
| | | | | | | | | |
* | | | | | | | | | Move conditional to a methodAlfredo Sumaran2016-05-252-1/+5
| | | | | | | | | |