summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-filtered-search-clear-button' into ↵26652-add-token-ui-for-filtered-search-barAlfredo Sumaran2017-02-249-34/+22
|\ | | | | | | | | | | | | | | '26652-add-token-ui-for-filtered-search-bar' Fix clear filtered search button See merge request !9427
| * Fix clear filtered search buttonfix-filtered-search-clear-buttonClement Ho2017-02-239-34/+22
|/
* Add token UI stylesClement Ho2017-02-2327-286/+950
|
* Merge branch 'enable-rspec-be_eql-cop' into 'master' Robert Speicher2017-02-234-8/+8
|\ | | | | | | | | Enable the RSpec/BeEql cop See merge request !9476
| * Enable the RSpec/BeEql copenable-rspec-be_eql-copRémy Coutable2017-02-234-8/+8
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '28610-white-square-nav' into 'master' Filipa Lacerda2017-02-231-6/+10
|\ \ | | | | | | | | | | | | | | | | | | Fix white square and sidebar animation Closes #28610 See merge request !9472
| * | Fix white square and sidebar animation28610-white-square-navAnnabel Dunstone Gray2017-02-231-6/+10
| | |
* | | Merge branch 'jej-contributing-styleguide-for-method-chaining' into 'master' Robert Speicher2017-02-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Switched CONTRIBUTING.md style guide recommendation for method chaining [ci skip] See merge request !9483
| * | | Switched CONTRIBUTING.md style guide recommendation for method chainingJames Edwards-Jones2017-02-231-1/+1
| | | |
* | | | Merge branch 'fix-git-access-specs' into 'master' Rémy Coutable2017-02-231-5/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitAccess specs Closes #28620 See merge request !9479
| * | | | Fix GitAccess specsfix-git-access-specsSean McGivern2017-02-231-5/+14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | These specs never ran due to incorrect indentation: the `context` blocks were inside the `before`. Additionally, `GitHooksService` now has to yield itself to callers, and `GitAccess` never appears to have had an `allowed?` method.
* | | | Merge branch '28450-test-compiling-frontend-assets-for-production-in-ci' ↵Jacob Schatz2017-02-237-6/+94
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Test compiling frontend assets for production in CI" Closes #28450 See merge request !9396
| * | | add CHANGELOG.md entry for !939628450-test-compiling-frontend-assets-for-production-in-ciMike Greiling2017-02-211-0/+4
| | | |
| * | | approve opener license (MIT)Mike Greiling2017-02-211-0/+6
| | | |
| * | | add webpack bundle analyzer to production outputMike Greiling2017-02-215-7/+73
| | | |
| * | | add production asset compile step to CI configMike Greiling2017-02-201-0/+12
| | | |
* | | | Merge branch 'master' into 'master' Clement Ho2017-02-236-1/+103
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | on branch deletion show loading icon and disabled the button See merge request !6761
| * | | | on branch deletion show loading icon and disabled the buttonwendy04022017-02-226-1/+103
| | | | | | | | | | | | | | | | | | | | | | | | | after user click delete branch, there is no processing indication, and user can click many times till. It seems flaw in UX. this will fix it fix bug in branch deletion link
* | | | | Merge branch 'dm-meer-blauw-op-straat' into 'master' Robert Speicher2017-02-23340-1538/+1561
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable (and disable) more RuboCops See merge request !9432
| * | | | | Fix new offensesdm-meer-blauw-op-straatDouwe Maan2017-02-232-6/+6
| | | | | |
| * | | | | Stylistic tweaksDouwe Maan2017-02-236-21/+21
| | | | | |
| * | | | | Fix OAuth/SAML user blocking behaviorDouwe Maan2017-02-231-1/+3
| | | | | |
| * | | | | Revert "Enable Style/DotPosition"Douwe Maan2017-02-23191-884/+886
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb
| * | | | | Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-23466-3228/+3228
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
| * | | | | Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-2332-59/+62
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48.
| * | | | | Manually correct autocorrectDouwe Maan2017-02-232-2/+4
| | | | | |
| * | | | | Move up delegate callsDouwe Maan2017-02-238-29/+25
| | | | | |
| * | | | | Exclude migrations from Style/MutableConstantDouwe Maan2017-02-2335-44/+47
| | | | | |
| * | | | | ActiveSupport delegation is preferred over ForwardableDouwe Maan2017-02-232-6/+5
| | | | | |
| * | | | | Update haml_lint to work with newest rubocopDouwe Maan2017-02-232-6/+6
| | | | | |
| * | | | | Add explanations to copsDouwe Maan2017-02-231-0/+61
| | | | | |
| * | | | | Update rubocop and rubocop-rspec and regenerate .rubocop_todo.ymlDouwe Maan2017-02-234-16/+9
| | | | | |
| * | | | | Update rubocop and rubocop-rspec and regenerate .rubocop_todo.ymlDouwe Maan2017-02-233-55/+74
| | | | | |
| * | | | | Order cops alphabeticallyDouwe Maan2017-02-231-121/+123
| | | | | |
| * | | | | Don’t exclude some file in lib from rubocopDouwe Maan2017-02-2335-213/+201
| | | | | |
| * | | | | Fix new offensesDouwe Maan2017-02-2318-62/+67
| | | | | |
| * | | | | Enable Rails/DelegateDouwe Maan2017-02-2325-110/+39
| | | | | |
| * | | | | Enable Style/WordArrayDouwe Maan2017-02-2369-164/+159
| | | | | |
| * | | | | Enable Style/MultilineHashBraceLayoutDouwe Maan2017-02-2320-103/+98
| | | | | |
| * | | | | Enable Style/MultilineArrayBraceLayoutDouwe Maan2017-02-2311-96/+133
| | | | | |
| * | | | | Enable Style/EmptyLineBetweenDefsDouwe Maan2017-02-235-1/+49
| | | | | |
| * | | | | Enable Style/ClassCheckDouwe Maan2017-02-2311-12/+12
| | | | | |
| * | | | | Regenerate .rubocop_todo.ymlDouwe Maan2017-02-231-276/+61
| | | | | |
| * | | | | Prefer leading style for Style/DotPositionDouwe Maan2017-02-23466-3215/+3215
| | | | | |
| * | | | | Fix another specDouwe Maan2017-02-231-1/+1
| | | | | |
| * | | | | Old migration doesn’t require downtimeDouwe Maan2017-02-231-0/+2
| | | | | |
| * | | | | Fix code for copsDouwe Maan2017-02-2344-213/+245
| | | | | |
| * | | | | Fix specsDouwe Maan2017-02-235-11/+12
| | | | | |
| * | | | | Enable Style/ConditionalAssignmentDouwe Maan2017-02-2332-104/+100
| | | | | |
| * | | | | Enable Style/ColonMethodCallDouwe Maan2017-02-2327-38/+36
| | | | | |
View Lorry Controller Status