summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix/gitlab-importer-issue' into 'master' Robert Speicher2016-05-261-3/+3
|\ | | | | | | | | | | | | | | | | Fix gitlab importer issue Fixed credentials not being called correctly - probably some bad refactoring or search & replace... Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565 See merge request !4301
| * fix bad refactoring of import data credentialsJames Lopez2016-05-261-3/+3
| |
* | Merge branch 'measure-proxy-timing' into 'master' Yorick Peterse2016-05-261-0/+24
|\ \ | |/ |/| | | | | Measure proxy flight time See merge request !4278
| * Rename metric to 'rails queue duration'Jacob Vosmaer2016-05-261-2/+2
| |
| * Align class name with field nameJacob Vosmaer2016-05-251-1/+1
| |
| * Send data to InfluxDB instead of stdoutJacob Vosmaer2016-05-251-4/+6
| |
| * Measure proxy timing: needs influxdb codeJacob Vosmaer2016-05-241-0/+22
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-263-2/+9
|\ \
| * \ Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz2016-05-251-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POC: Updated contrib calendar In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it? ![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png) cc. @jschatz1 See merge request !3944
| | * | Group the contributing calendar by dayPhil Hughes2016-05-161-1/+1
| | | | | | | | | | | | | | | | This aligns the boxes correctly with the day on the left side of the calendar
| * | | Merge branch 'fix/import-url-uri-issue' into 'master' Douwe Maan2016-05-251-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | fix changelog and mergefix/import-url-uri-issueJames Lopez2016-05-231-1/+1
| | | | |
| * | | | Merge branch 'issue_10725' into 'master' Douwe Maan2016-05-251-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix forks creation when visibility level is restricted fixes #10725 See merge request !4283
| | * | | | Fix forks creation when visibility level is restrictedissue_10725Felipe Artur2016-05-251-0/+7
| | | | | |
* | | | | | Merge branch 'fix-issue-17496' into 'master' Douwe Maan2016-05-251-2/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix groups API to list only user's accessible projects Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17496 See merge request !1966
| * | | | | Fix groups API to list only user's accessible projectsStan Hu2016-05-241-2/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Closes #17496
* | | | | Merge branch 'complexity/enable-multiple-rubocop-cops-2' into 'master' Robert Speicher2016-05-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Enable multiple compatible Rubocop copscomplexity/enable-multiple-rubocop-cops-2Grzegorz Bizon2016-05-251-1/+1
| |/ / / / | | | | | | | | | | | | | | | Closes #17406
* | | | | Switch the gitlab:db:configure task to use tables.any? instead of looking ↵DJ Mountney2016-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | specifically for the schema_migrations table
* | | | | Update hash syntax and add changelog for the gitlab:db:configure rake taskDJ Mountney2016-05-251-2/+1
| | | | |
* | | | | Add a gitlab:db:configure rake task to handle conditionally seeding or ↵DJ Mountney2016-05-251-0/+11
| |/ / / |/| | | | | | | | | | | migrating the database.
* | | | Merge branch 'incremental-fixes' into 'master' Jacob Schatz2016-05-251-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Replace \n to <br>Kamil Trzcinski2016-05-231-1/+3
| |/ / /
* | | | Merge branch 'fix-registry-backups' into 'master' Douwe Maan2016-05-252-9/+26
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix backups if registry is disabled Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17749 See merge request !4263
| * | | Improve after reviewfix-registry-backupsKamil Trzcinski2016-05-241-5/+5
| | | |
| * | | Fix backups if registry is disabledKamil Trzcinski2016-05-232-8/+25
| |/ /
* | | Add rubocop-rspecrs-rubocop-rspecRobert Speicher2016-05-231-0/+1
| | | | | | | | | | | | | | | Almost all cops are starting as disabled until we can fix their violations.
* | | Merge branch 'rs-space-around-keyword' into 'master' Robert Speicher2016-05-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/SpaceAroundKeyword cop and fix offenses Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478 See merge request !4259
| * | | Enable Style/SpaceAroundKeyword cop and fix offensesRobert Speicher2016-05-231-1/+1
| | | |
* | | | Merge branch 'rs-range-include' into 'master' Robert Speicher2016-05-231-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Performance/RangeInclude cop and fix single offense Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478 See merge request !4255
| * | | | Enable Performance/RangeInclude cop and fix single offensers-range-includeRobert Speicher2016-05-231-1/+1
| |/ / /
* | | | Enable Style/DefWithParentheses cop and fix single offenseRobert Speicher2016-05-231-1/+1
|/ / /
* | | Fix Error 500 in CI charts by gracefully handling commits with no durationsStan Hu2016-05-221-1/+2
|/ / | | | | | | Closes #17730
* | Merge branch 'registry_admin_docs' into 'master' Achilleas Pipinellis2016-05-231-0/+53
|\ \ | | | | | | | | | | | | | | | | | | Docker container registry configuration docs. Part of gitlab-org/omnibus-gitlab!764 and gitlab-org/gitlab-ce!4040 See merge request !4141
| * | Add note about port needed in NGINX configAchilleas Pipinellis2016-05-221-0/+2
| | |
| * | Add NGINX config file for RegistryAchilleas Pipinellis2016-05-221-0/+51
| | |
* | | Extend comment for migrations helper MySQL fixGrzegorz Bizon2016-05-221-1/+8
| | |
* | | Add MySQL compatibility fix in migration helpersGrzegorz Bizon2016-05-221-1/+2
|/ /
* | Merge branch 'zj-gitignore-dropdown'Douwe Maan2016-05-205-0/+140
|\ \
| * | Dropdown implementationzj-gitignore-dropdownAlfredo Sumaran2016-05-201-5/+5
| | |
| * | Update API and fetching taskZeger-Jan van de Weg2016-05-202-38/+46
| | |
| * | Backend for a gitignores dropdownZeger-Jan van de Weg2016-05-205-0/+132
| | |
* | | Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'Douwe Maan2016-05-203-8/+53
|\ \ \ | | | | | | | | | | | | | | | | # Conflicts: # app/services/system_note_service.rb
| * | | Reuse existing SCSS variablesadambutler/gitlab-ce-feature/support-diff-of-issue-title-renameRémy Coutable2016-05-181-2/+12
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler2016-05-183-8/+43
| | | | | | | | | | | | | | | | Gitlab::Diff::InlineDiff
* | | | Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master' Douwe Maan2016-05-201-1/+43
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement special GitLab markdown reference for milestones https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions: - Move changelog item to 8.8 - Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829 See merge request !3897
| * | | Merge remote-tracking branch 'origin/master' into ↵Rémy Coutable2016-05-1868-476/+1200
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | eReGeBe/gitlab-ce-feature/milestone-md Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Fix cross-project milestone ref with invalid projectDouwe Maan2016-04-231-11/+17
| | | | |
| * | | | Merge branch 'master' into eReGeBe/gitlab-ce-feature/milestone-mdDouwe Maan2016-04-236-44/+42
| |\ \ \ \
| * | | | | Using project `path_with_namespace` in milestone's cross project references ↵Alejandro Rodríguez2016-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | link text