summaryrefslogtreecommitdiff
Commit message (Expand)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
* Fix rubocop offenses. It's not checked before whenLin Jen-Shin2018-01-262-5/+8
* 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
* Ignore flay warningsLin Jen-Shin2018-01-261-1/+1
* Avoid loading rspec-parameterized to avoid warningsLin Jen-Shin2018-01-261-1/+1
* Don't print stdout in case we're just printing warningsLin Jen-Shin2018-01-261-1/+0
* 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
* Merge branch '42420-follow-up-from-resolve-asset-was-not-declared-to-be-preco...Grzegorz Bizon2018-01-266-13/+29
|\
| * 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
* | Merge branch 'qa/ee-4698-backport' into 'master'Grzegorz Bizon2018-01-268-15/+92
|\ \
| * | 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
| |\ \
| * | | Backport QA changes from EEGabriel Mazetto2018-01-268-11/+87
* | | | Merge branch 'filipefreire_155' into 'master'Rémy Coutable2018-01-264-0/+43
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into filip...Filipe Freire2018-01-251-2/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into filip...Filipe Freire2018-01-25969-9131/+15572
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | 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
| * | | | | Merge branch 'filipefreire_155' of https://gitlab.com/filipefreire/gitlab-ce ...Filipe Freire2018-01-160-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into filip...Filipe Freire2018-01-16256-2086/+4021
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into filip...Filipe Freire2018-01-16256-2086/+4021
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| * | | | | | improvement after CRFilipe Freire2018-01-124-8/+29
| * | | | | | 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 mockingwinh-check-axios-restoreWinnie Hellmann2018-01-252-0/+18
* | | | | | | Merge branch 'qa-secret-variables-scenario' into 'master'Grzegorz Bizon2018-01-267-1/+131
|\ \ \ \ \ \ \
| * | | | | | | 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
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'fix-local-rspec-tests' into 'master'Mike Greiling2018-01-261-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | fix bug in webpack_helper in which force_same_domain argument was ignored bre...fix-local-rspec-testsMike Greiling2018-01-251-1/+1
* | | | | | | | Merge branch 'fix/rubocop-offenses-in-repo-spec' into 'master'Robert Speicher2018-01-251-2/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | 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 versionTobias Gurtzick2018-01-253-8/+11
* | | | | | | | Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'Robert Speicher2018-01-259-11/+80
|\ \ \ \ \ \ \ \
| * | | | | | | | Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-249-11/+80
* | | | | | | | | Merge branch '34952-only-tags-is-not-taken-in-account-in-the-cache-gems-job' ...Robert Speicher2018-01-251-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ensure the job also run for tagsRémy Coutable2018-01-251-2/+1
* | | | | | | | | | Merge branch 'move-users-spinach-tests-to-rspec' into 'master'Robert Speicher2018-01-253-124/+107
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status