Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-27Confidential notes data leakdata_leakValery Sizov
2016-05-26Merge branch 'sidebar-expand-collapse' into 'master' Jacob Schatz
Fix right sidebar expand/collapse issue Fixed branch name of the !4117 ------------------ Fixes #15643 - Fixed a typo in `toggleSidebar` method of `Sidebar` class. - Fixed a minor styling issue to fix the sidebar to the top of the page. - Added tests for Sidebar. ## Before ![before](/uploads/c4efe9a64e0ae35f423302753caa6dfd/sFBwnVEpQB.gif) ## After ![after](/uploads/23e6b80888dae475a385912c8c40bdbd/rerKiYC4dk.gif) See merge request !4292
2016-05-26Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet
sidebar-expand-collapse
2016-05-26Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2016-05-26Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz
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
2016-05-26Merge branch '17339-mobile-navigation' into 'master' Jacob Schatz
Mobile navigation fade out Closes #17339 Closes #17610 <img src="/uploads/e382dd363bf8beb28339fa6b152be092/Screen_Shot_2016-05-18_at_10.16.59_AM.png" width="400px"> See merge request !4195
2016-05-26Merge branch 'upgrade-state_machines-activerecord' into 'master' Robert Speicher
Update state_machines-activerecord from 0.3.0 to 0.4.0. Includes support for Rails 5, working towards #14286. See merge request !4295
2016-05-26Change to xs breakpoint, layout_nav updatesAnnabel Dunstone
2016-05-26Add fade out to sub navAnnabel Dunstone
2016-05-26Add fade to project nav; fix bug with controlsAnnabel Dunstone
2016-05-26Refactor nav links cssAnnabel Dunstone
2016-05-26Add fade out to left side of layout nav; remove dropdown nav helper; remove ↵Annabel Dunstone
controls button from mobile
2016-05-26Fix coffeescript; remove fade out div so area is clickable; remove scrollbar ↵Annabel Dunstone
on chrome
2016-05-26Move fade out divAnnabel Dunstone
2016-05-26Check screen width before increasing max positionAnnabel Dunstone
2016-05-26Remove arrows from mobile scroll fade outAnnabel Dunstone
2016-05-26Start scrolling tabs designAnnabel Dunstone
2016-05-26Merge branch 'add_ha_diagrams' into 'master' Achilleas Pipinellis
Add new HA diagrams [ci skip] ## What does this MR do? Adds new HA diagrams created by @lukebabb (Thanks @lukebabb!) See merge request !4289
2016-05-26Update state_machines-activerecord from 0.3.0 to 0.4.0.Connor Shea
No changelog, see commits: https://github.com/state-machines/state_machines-activerecord/commits/master Includes Rails 5 support.
2016-05-26Merge branch 'rs-fix-rubocop' into 'master' Robert Speicher
Fix RuboCop See merge request !4294
2016-05-26Fix RuboCopRobert Speicher
2016-05-26Merge branch 'rs-confirmation-mail' into 'master' Robert Speicher
New confirmation email See merge request !3354
2016-05-25Add CHANGELOG entry for redesigned confirmation emailsRobert Speicher
[ci skip]
2016-05-25Don't remove IDs via premailerRobert Speicher
This makes it easier to debug style rules.
2016-05-25New confirmation email :fire:Robert Speicher
2016-05-25Make the standard Devise confirmation email our new plaintext versionRobert Speicher
2016-05-25Customize ActionMailer preview pathRobert Speicher
2016-05-25Merge branch 'rs-remove-issue_to_atom' into 'master' Douwe Maan
Remove `issue_to_atom` helper See merge request !4265
2016-05-25Merge branch 'improve-pipeline-design' into 'master' Douwe Maan
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-25Merge branch 'rs-event-atom-partial' into 'master' Douwe Maan
Remove `event_to_atom` helper See merge request !4234
2016-05-25Merge branch 'fix/import-url-uri-issue' into 'master' Douwe Maan
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-25Merge branch 'issue_10725' into 'master' Douwe Maan
Fix forks creation when visibility level is restricted fixes #10725 See merge request !4283
2016-05-25Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet
sidebar-expand-collapse
2016-05-25Merge branch 'zero-project-creation-error-message' into 'master' Robert Speicher
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-25Merge branch 'fix-issue-17496' into 'master' Douwe Maan
Fix groups API to list only user's accessible projects Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17496 See merge request !1966
2016-05-25Merge branch 'closed-by-alignment' into 'master' Jacob Schatz
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-25Merge remote-tracking branch 'github/master' into 'master'Robert Speicher
2016-05-25Update CHANGELOG for 8.8.2Robert Speicher
[ci skip]
2016-05-25Merge branch 'dz-improve-ui-guide' into 'master' Jacob Schatz
Write some thoughts to the UI guide cc @skyruler See merge request !4290
2016-05-25Merge branch 'issue-filter-name-options' into 'master' Jacob Schatz
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-25Merge branch 'complexity/enable-multiple-rubocop-cops-2' into 'master' Robert Speicher
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-25Merge branch 'gitlab-import-status' into 'master' Jacob Schatz
Fixed issue with GitLab import buttons having a spinner ![import](/uploads/db635f1d62affefca027d5fd4f545cd1/import.gif) Closes #17232 See merge request !4276
2016-05-25Merge branch 'db-configure-rake-task' into 'master' Robert Speicher
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-25Merge branch 'generic-commit-status' into 'master' Jacob Schatz
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-25Remove unneeded indentation from RuboCop configRobert Speicher
[ci skip]
2016-05-25Merge branch 'fix-grammar-issues' into 'master' Jacob Schatz
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-25Merge pull request #10338 from donhui/patch-1Robert Speicher
Fix typo in HA documentation [ci skip]
2016-05-25Fix the english.Jacob Schatz
2016-05-25Write some thoughts to the UI guideDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-25Merge branch 'layout-nav-zindex' into 'master' Jacob Schatz
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