summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enable multiple compatible Rubocop copscomplexity/enable-multiple-rubocop-cops-2Grzegorz Bizon2016-05-252-27/+43
| | | | Closes #17406
* Merge branch 'master' into 'master' Stan Hu2016-05-240-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update health_check.md - Fix spelling of admin/health_check path. [ci skip]Ryan Rustong2016-05-241-1/+1
| |
* | Merge branch 'snippets-ui' into 'master' Jacob Schatz2016-05-2410-59/+122
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Updated snippets testssnippets-uiPhil Hughes2016-05-192-4/+4
| | |
| * | Updated snippets UIPhil Hughes2016-05-188-55/+118
| | | | | | | | | | | | Closes #14328
* | | Merge branch 'project-settings' into 'master' Jacob Schatz2016-05-247-324/+274
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fixed project settings testsproject-settingsPhil Hughes2016-05-201-1/+1
| | | |
| * | | Project settings UI updatePhil Hughes2016-05-206-323/+273
| | | |
* | | | Merge branch 'scroll-to-changes-content' into 'master' Jacob Schatz2016-05-241-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Clicking changes tab scrolls the window to show the contentscroll-to-changes-contentPhil Hughes2016-05-181-0/+3
| | | | | | | | | | | | | | | | | | | | Closes #15133
* | | | | Merge branch 'patch-2' into 'master' Robert Speicher2016-05-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update branch name from 8-7-stable to 8-8-stable Fix inconsistency with the command listed above. [ci skip] See merge request !4274
| * | | | | Update branch name from 8-7-stable to 8-8-stableFlorian Preinstorfer2016-05-241-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix_typo_on_monitoring_help_page' into 'master' Robert Speicher2016-05-241-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in link on monitoring help page Closes #17809 [ci skip] See merge request !4281
| * | | | fixing typo in link #17809sebastian-schmid2016-05-241-1/+1
|/ / / /
* | | | Merge branch 'gitlab-shell-changelog' into 'master' Stan Hu2016-05-241-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CHANGELOG entry about using gitlab-shell v3.0.0 See merge request !4272
| * | | | Add CHANGELOG entry about using gitlab-shell v3.0.0Stan Hu2016-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'gitlab-shell-v3.0.0' into 'master' Stan Hu2016-05-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Use gitlab-shell 3.0.0Jacob Vosmaer2016-05-231-1/+1
| | | | | |
* | | | | | Merge branch 'mrchrisw/google-api' into 'master' Achilleas Pipinellis2016-05-241-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Update Google integration API workflowmrchrisw/google-apiChris Wilson2016-05-231-2/+2
| | | | | |
* | | | | | Merge branch 'project-navigation-redesign' into 'master' Dmitriy Zaporozhets2016-05-2339-361/+402
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Move files tab before commits tab to follow same order as top navigationproject-navigation-redesignDmitriy Zaporozhets2016-05-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Fix badge count UI for pipelines menu itemDmitriy Zaporozhets2016-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Use start_with? instead of regexDmitriy Zaporozhets2016-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Add changelog item for project navigation UIDmitriy Zaporozhets2016-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Merge branch 'master' into project-navigation-redesignDmitriy Zaporozhets2016-05-23517-1221/+10490
| |\ \ \ \ \ \
| * | | | | | | Change rgba to hex; use sass variables to calculate header heightAnnabel Dunstone2016-05-232-2/+2
| | | | | | | |
| * | | | | | | Redesign sublevel nav links; vertically align project image; fix spacingAnnabel Dunstone2016-05-192-6/+10
| | | | | | | |
| * | | | | | | Fix alignment of repo buttonsAnnabel Dunstone2016-05-191-1/+1
| | | | | | | |
| * | | | | | | Redesign project page headerAnnabel Dunstone2016-05-1912-119/+208
| | | | | | | |
| * | | | | | | Fix dashboard shortcutsDmitriy Zaporozhets2016-05-173-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix file browsing testDmitriy Zaporozhets2016-05-161-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix shortcuts testsDmitriy Zaporozhets2016-05-163-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Modify tests to match new navigation behaviour for project pagesDmitriy Zaporozhets2016-05-1614-86/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix spec for new project navigationDmitriy Zaporozhets2016-05-162-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Implement new horizontal navigation to project pagesDmitriy Zaporozhets2016-05-168-128/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'rs-rubocop-rspec' into 'master' Dmitriy Zaporozhets2016-05-234-0/+69
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rubocop-rspec Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17761 See merge request !4264
| * | | | | | | Add descriptive comments for rubocop-rspec copsRobert Speicher2016-05-231-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Add rubocop-rspecrs-rubocop-rspecRobert Speicher2016-05-234-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Almost all cops are starting as disabled until we can fix their violations.
* | | | | | | | Merge branch 'version-bump-8-9-pre' into 'master' Robert Speicher2016-05-232-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Its time for 8.9 See merge request !4262
| * | | | | | | Its time for 8.9Dmitriy Zaporozhets2016-05-232-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'complexity/enable-multiple-rubocop-cops' into 'master' Robert Speicher2016-05-231-34/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Enabled multiple Rubocop cops that can be enabledGrzegorz Bizon2016-05-231-34/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables multiple Rubocop cops that already conform to our codebase and do not require fixes.
* | | | | | | | | Merge branch 'rs-space-around-keyword' into 'master' Robert Speicher2016-05-237-9/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-237-9/+7
| | | | | | | | | |
* | | | | | | | | | Merge branch 'rs-update-rubocop' into 'master' Robert Speicher2016-05-233-9/+27
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rubocop to 0.40.0 See merge request !4258
| * | | | | | | | | Update rubocop to 0.40.0Robert Speicher2016-05-233-9/+27
| |/ / / / / / / /
* | | | | | | | | Merge branch 'complexity/rubocop-style-loop' into 'master' Robert Speicher2016-05-232-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Enable Style/InfiniteLoop Rubocop copcomplexity/rubocop-style-loopGrzegorz Bizon2016-05-232-2/+2
| | | | | | | | |