summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update gitlab-styles and update .rubocop.yml41972-make-sure-no-warningsLin Jen-Shin2018-01-262-5/+1
|
* Remove bin/upgrade.rb as we don't seem to refer itLin Jen-Shin2018-01-261-3/+0
|
* Use Process::Status rather than an integerLin Jen-Shin2018-01-265-20/+20
| | | | However keep backward compatibility
* Fix rubocop offenses. It's not checked before whenLin Jen-Shin2018-01-262-5/+8
| | | | it's inside lib/tasks/*
* Eliminate the last warning for redis wrapperLin Jen-Shin2018-01-262-1/+2
|
* We need Rails in order to use Gitlab.config anywayLin Jen-Shin2018-01-262-4/+1
|
* Eliminate the warnings for databaseLin Jen-Shin2018-01-261-11/+9
|
* Eliminate the warnings from task helpersLin Jen-Shin2018-01-2613-54/+45
|
* Convert parser warnings to stdout in haml_lintLin Jen-Shin2018-01-261-0/+9
| | | | | So we ignore it in static-analysis when status is 0, yet still report it if it's not.
* Ignore flay warningsLin Jen-Shin2018-01-261-1/+1
|
* Avoid loading rspec-parameterized to avoid warningsLin Jen-Shin2018-01-261-1/+1
| | | | | | | | | | | | | for parser which is emitting: ``` warning: parser/current is loading parser/ruby23, which recognizes warning: 2.3.5-compliant syntax, but you are running 2.3.6. warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri. ``` There's no easy way to disable this, and we're already using the latest version. This should be harmless anyway.
* Don't print stdout in case we're just printing warningsLin Jen-Shin2018-01-261-1/+0
| | | | Otherwise it could be confusing
* Generate secret first to avoid warnings laterLin Jen-Shin2018-01-261-0/+1
|
* Fail static-analysis if there's output to stderrLin Jen-Shin2018-01-266-24/+258
| | | | TODO: fix offenders
* Merge branch ↵Grzegorz Bizon2018-01-266-13/+29
|\ | | | | | | | | | | | | | | | | '42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-ico' into 'master' Port some non-EE-specific config/ changes to CE Closes #42420 See merge request gitlab-org/gitlab-ce!16710
| * Port some non-EE-specific config/ changes to CE42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-icoRémy Coutable2018-01-256-13/+29
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'qa/ee-4698-backport' into 'master'Grzegorz Bizon2018-01-268-15/+92
|\ \ | | | | | | | | | | | | | | | | | | Backport QA changes from EE Closes gitlab-ee#4698 See merge request gitlab-org/gitlab-ce!16728
| * | Pick EE for qa/qa/page/menu/side.rbqa/ee-4698-backportLin Jen-Shin2018-01-261-0/+1
| | |
| * | Pick the EE version for this fileLin Jen-Shin2018-01-261-5/+5
| | |
| * | Merge remote-tracking branch 'upstream/master' into qa/ee-4698-backportLin Jen-Shin2018-01-269-4/+139
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: Just don't expand if it's already expanded fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec tests Fix rubocop offenses introduced in !16623 Prefer local variables over given/let Try to restore page's state Add more views check Respect the latest changes from master Add a scenario for adding secret variables
| * | | Backport QA changes from EEGabriel Mazetto2018-01-268-11/+87
| | | |
* | | | Merge branch 'filipefreire_155' into 'master'Rémy Coutable2018-01-264-0/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | gitlab-qa !155 - push creates event on activity page See merge request gitlab-org/gitlab-ce!16423
| * \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into ↵Filipe Freire2018-01-251-2/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | filipefreire_155
| * \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into ↵Filipe Freire2018-01-25969-9131/+15572
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | filipefreire_155
| * | | | | improve push events selector in activity.rbFilipe Freire2018-01-181-5/+1
| | | | | |
| * | | | | improve interaction with activity on side.rbFilipe Freire2018-01-181-1/+3
| | | | | |
| * | | | | improvements after CRFilipe Freire2018-01-165-28/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + move activity click to side.rb + add element check on activity.rb + minor fixes
| * | | | | Merge branch 'filipefreire_155' of https://gitlab.com/filipefreire/gitlab-ce ↵Filipe Freire2018-01-160-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into filipefreire_155
| | * \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into ↵Filipe Freire2018-01-16256-2086/+4021
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | filipefreire_155
| * | \ \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into ↵Filipe Freire2018-01-16256-2086/+4021
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / filipefreire_155
| * | | | | | improvement after CRFilipe Freire2018-01-124-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - test reaches Activity page - the actual git push seems to be failing - had problems with defining selectors
| * | | | | | improvements after CRFilipe Freire2018-01-122-9/+8
| | | | | | |
| * | | | | | Add relevant element for push event buttonFilipe Freire2018-01-121-7/+4
| | | | | | |
| * | | | | | gitlab-qa !155 push creates event on activity pageFilipe Freire2018-01-122-0/+42
| | | | | | |
* | | | | | | Merge branch 'winh-check-axios-restore' into 'master'Filipa Lacerda2018-01-262-0/+18
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Make sure that axios adapater is restored after mocking See merge request gitlab-org/gitlab-ce!16660
| * | | | | | Make sure that axios adapater is restored after mockingwinh-check-axios-restoreWinnie Hellmann2018-01-252-0/+18
| | | | | | |
* | | | | | | Merge branch 'qa-secret-variables-scenario' into 'master'Grzegorz Bizon2018-01-267-1/+131
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a scenario for adding secret variables See merge request gitlab-org/gitlab-ce!16607
| * | | | | | | Just don't expand if it's already expandedLin Jen-Shin2018-01-261-4/+2
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into qa-secret-variables-scenarioLin Jen-Shin2018-01-2646-355/+542
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec tests Fix rubocop offenses introduced in !16623 fix documentation about node version Ensure the job also run for tags Open links in a new tab on the user page Improve empty project overview Look for rugged with static analysis Cache rubocop cache for CI Update gitlab-styles and re-enable the RSpec/SingleLineHook cop again Make Gitlab::Git::Repository#run_git private Move user page spinach tests to RSpec Handle special characters on API request of issuable templates Update secret_values to support dynamic elements within parent Disable throwOnError in KaTeX to reveal user where is the problem Migrate restoring repo from bundle to Gitaly
* | | | | | | | Merge branch 'fix-local-rspec-tests' into 'master'Mike Greiling2018-01-261-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix local RSpec tests due to bug in `webpack_bundle_tag` Closes #42368 See merge request gitlab-org/gitlab-ce!16724
| * | | | | | | fix bug in webpack_helper in which force_same_domain argument was ignored ↵fix-local-rspec-testsMike Greiling2018-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | breaking local rspec tests
* | | | | | | | Merge branch 'fix/rubocop-offenses-in-repo-spec' into 'master'Robert Speicher2018-01-251-2/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Fix rubocop offenses introduced in !16623 See merge request gitlab-org/gitlab-ce!16722
| * | | | | | | Fix rubocop offenses introduced in !16623Ahmad Sherif2018-01-251-2/+7
| | | | | | | |
* | | | | | | | Merge branch 'update-node-docs' into 'master'Jacob Schatz2018-01-253-8/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix documentation about node version Closes #41438 See merge request gitlab-org/gitlab-ce!16720
| * | | | | | | fix documentation about node versionTobias Gurtzick2018-01-253-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves #41438
* | | | | | | | Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'Robert Speicher2018-01-259-11/+80
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate restoring repo from bundle to Gitaly Closes gitaly#946 See merge request gitlab-org/gitlab-ce!16623
| * | | | | | | | Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-249-11/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#946
* | | | | | | | | Merge branch '34952-only-tags-is-not-taken-in-account-in-the-cache-gems-job' ↵Robert Speicher2018-01-251-2/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "`only: - tags` is not taken in account in the `cache gems` job" Closes #34952 See merge request gitlab-org/gitlab-ce!16721
| * | | | | | | | | Ensure the job also run for tagsRémy Coutable2018-01-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'move-users-spinach-tests-to-rspec' into 'master'Robert Speicher2018-01-253-124/+107
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move user page spinach tests to RSpec See merge request gitlab-org/gitlab-ce!16598
View Lorry Controller Status