summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Clicking search pill focuses fieldsearch-box-blurPhil Hughes2016-05-243-18/+15
| | | | | | | | | When clicking the pill in the search field, it now focus the field. Previously you would have to make sure you click in the field. Fixed an issue where clicking out of the field wouldn't remove the focus outline Also reduced some of the HTML to remove what isn't needed
* 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
| | | | | |
* | | | | | Merge branch 'rs-range-include' into 'master' Robert Speicher2016-05-232-3/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-232-3/+2
| |/ / / /
* | | | | Merge branch 'rs-start-with' into 'master' Robert Speicher2016-05-233-4/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Performance/StartWith cop and fix offenses Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478 See merge request !4256
| * | | | | Enable Performance/StartWith cop and fix offensesrs-start-withRobert Speicher2016-05-233-4/+3
| |/ / / /
* | | | | Merge branch '17736-builds-hotfix' into 'master' Jacob Schatz2016-05-232-12/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix builds page Fixes #17736 Fixes #17703 - Move tags into column - Put column headers back <img src="/uploads/57609fd2d65c3b80f57b32cbbe316653/Screen_Shot_2016-05-23_at_10.20.37_AM.png" width="800px"> See merge request !4249
| * | | | | Revert commit info changeAnnabel Dunstone2016-05-231-10/+10
| | | | | |
| * | | | | Put column headers back17736-builds-hotfixAnnabel Dunstone2016-05-231-0/+11
| | | | | |
| * | | | | Move build info out of pipeline conditionalAnnabel Dunstone2016-05-231-10/+10
| | | | | |
| * | | | | Move tags into columnAnnabel Dunstone2016-05-231-12/+12
| | | | | |
* | | | | | Merge branch 'rs-def-with-parenthesis' into 'master' Robert Speicher2016-05-232-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/DefWithParentheses cop and fix single offense Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478 See merge request !4254
| * | | | | Enable Style/DefWithParentheses cop and fix single offenseRobert Speicher2016-05-232-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'container-registry-user-docs' into 'master' Achilleas Pipinellis2016-05-234-0/+114
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial version of user documentation of container registry cc @axil See merge request !4244
| * | | | Copyedit Registry user docsAchilleas Pipinellis2016-05-233-27/+56
| | | | |
| * | | | Fix link to container Registry user docsAchilleas Pipinellis2016-05-231-1/+1
| | | | |
| * | | | Initial version of user documentation of container registrycontainer-registry-user-docsKamil Trzcinski2016-05-224-0/+85
| | | | |
* | | | | Merge branch 'fix-ci-charts-error-500' into 'master' Robert Speicher2016-05-233-1/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 in CI charts by gracefully handling commits with no durations ## What does this MR do? In the CI charts, this MR reports the duration of a commit to 0 if it is `nil`. ## Are there points in the code the reviewer needs to double check? Should we omit this commit from the chart or set it to some other value? ## Why was this MR needed? We were getting an Error 500 here: https://gitlab.com/gitlab-org/gitlab-ce/graphs/master/ci ## What are the relevant issue numbers? #17730 See merge request !4245