summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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 remote-tracking branch 'upstream/master' into qa-secret-variables-scenarioqa-secret-variables-scenarioLin Jen-Shin2018-01-2561-201/+383
| | | | |\
| | | | * | Prefer local variables over given/letLin Jen-Shin2018-01-251-3/+3
| | | | * | Try to restore page's stateLin Jen-Shin2018-01-251-10/+5
| | | | * | Add more views checkLin Jen-Shin2018-01-251-0/+9
| | | | * | Respect the latest changes from masterLin Jen-Shin2018-01-258-48/+30
| | | | * | Merge remote-tracking branch 'upstream/master' into qa-secret-variables-scenarioLin Jen-Shin2018-01-25478-5327/+8129
| | | | |\ \
| | | | * | | Add a scenario for adding secret variablesLin Jen-Shin2018-01-227-3/+167
* | | | | | | Backport QA changes from EEGabriel Mazetto2018-01-268-11/+87
|/ / / / / /
* | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | Move user page spinach tests to RSpecSemyon Pupkov2018-01-253-124/+107
* | | | | | | | | Merge branch '42338-rubocop-cache' into 'master'Robert Speicher2018-01-252-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cache rubocop cache for CI42338-rubocop-cacheLin Jen-Shin2018-01-252-1/+7
* | | | | | | | | | Merge branch 'katex-throwOnError' into 'master'Filipa Lacerda2018-01-252-1/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Disable throwOnError in KaTeX to reveal user where is the problemJakub Jirutka2018-01-242-1/+6
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-2513-73/+75
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-2513-73/+75
* | | | | | | | | | Merge branch '40028-special-characters-on-issuable-templates' into 'master'Rémy Coutable2018-01-254-4/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Handle special characters on API request of issuable templatesTakuya Noguchi2018-01-254-4/+9
* | | | | | | | | | | Merge branch 'contrain-run-git' into 'master'Rémy Coutable2018-01-252-83/+97
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Make Gitlab::Git::Repository#run_git privatecontrain-run-gitJacob Vosmaer2018-01-252-83/+97
* | | | | | | | | | | Merge branch 'feat/add-section-headers-to-project-repo-buttons' into 'master'Rémy Coutable2018-01-254-13/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improve empty project overviewGeorge Tsiolis2018-01-254-13/+22
* | | | | | | | | | | | Merge branch 'update-secret-values-to-support-dynamic-elements' into 'master'Filipa Lacerda2018-01-254-26/+117
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update secret_values to support dynamic elements within parentupdate-secret-values-to-support-dynamic-elementsEric Eastwood2018-01-244-26/+117
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '42385-enable-the-rspec-singlelinehook-cop' into 'master'Robert Speicher2018-01-252-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update gitlab-styles and re-enable the RSpec/SingleLineHook cop again42385-enable-the-rspec-singlelinehook-copRémy Coutable2018-01-252-5/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'profile-link-target-blank' into 'master'Rémy Coutable2018-01-251-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Open links in a new tab on the user pageAchilleas Pipinellis2018-01-251-3/+3
* | | | | | | | | | | | Merge branch 'fix/batch-lfs-pointers-accepting-lazy-enum' into 'master'Grzegorz Bizon2018-01-253-3/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix .batch_lfs_pointers accepting a lazy enumeratorfix/batch-lfs-pointers-accepting-lazy-enumAhmad Sherif2018-01-253-3/+18
* | | | | | | | | | | | | Merge branch 'gitaly-repo-exists' into 'master'Douwe Maan2018-01-252-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make Gitaly RepositoryExists opt-outJacob Vosmaer (GitLab)2018-01-252-1/+6
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '42377-fix-merge-request-can-be-reverted' into 'master'Rémy Coutable2018-01-252-3/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Look at notes created just before merge when deciding if an MR can be revertedNick Thomas2018-01-252-3/+19