summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Take ee words into accountbvl-free-unused-namesBob Van Landuyt2017-07-242-14/+28
* Add contents of `public` as forbidden top-level routesBob Van Landuyt2017-07-241-0/+10
* Remove a bunch of reserved top level routesBob Van Landuyt2017-07-241-10/+0
* Adjust `PathRegex` to validate files in the `public` directoryBob Van Landuyt2017-07-241-7/+39
* Merge branch 'fix-old-ci-api' into 'master'Grzegorz Bizon2017-07-222-1/+67
|\
| * Fix support for old CI API when image or services are not specifiedfix-old-ci-apiKamil Trzcinski2017-07-222-1/+67
* | Merge branch 'short-circuit-coverage-with-empty-regex' into 'master'Grzegorz Bizon2017-07-224-5/+32
|\ \
| * | Short-circuit build coverage extraction for empty regexesNick Thomas2017-07-224-5/+32
|/ /
* | Update VERSION to 9.5.0-prev9.5.0.preJames Edwards-Jones2017-07-221-1/+1
* | Update CHANGELOG.md for 9.4.0James Edwards-Jones2017-07-22179-723/+187
* | Merge branch 'zj-pipeline-badge-improvements' into 'master'Grzegorz Bizon2017-07-2215-114/+159
|\ \
| * | Port spinach tests to rspec feature specszj-pipeline-badge-improvementsZ.J. van de Weg2017-07-213-64/+61
| * | Reword success to passing for pipeline badgesZ.J. van de Weg2017-07-215-3/+22
| * | Rename build to pipeline for status badgesZ.J. van de Weg2017-07-2112-54/+83
* | | Merge branch '35368-fix-gcovr-regexp-matching' into 'master'Grzegorz Bizon2017-07-222-0/+8
|\ \ \
| * | | Fix the gcovr coverage regex by removing line separators before scanningNick Thomas2017-07-212-0/+8
* | | | Merge branch '35178-remember-me-in-omniauth-box-seems-too-close-to-icons' int...Clement Ho2017-07-212-3/+3
|\ \ \ \
| * | | | add padding above Remember Me for social login35178-remember-me-in-omniauth-box-seems-too-close-to-iconsSimon Knox2017-07-202-3/+3
* | | | | Merge branch 'dz-sidekiq-remove-queue' into 'master'Sean McGivern2017-07-211-0/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Capitalize Sidekiq word in dev docDmitriy Zaporozhets2017-07-211-1/+1
| * | | | Update sidekiq_style_guide.md with removing or renaming queues instructionsdz-sidekiq-remove-queueDmitriy Zaporozhets2017-07-211-0/+7
| | |/ / | |/| |
* | | | Merge branch 'harishsr-fix-typo-in-ldap-docs' into 'master'Drew Blessing2017-07-211-1/+1
|\ \ \ \
| * | | | Fix typo in the LDAP docs missing a required colonHarish Ramachandran2017-07-191-1/+1
* | | | | Merge branch '35236-svg-logo' into 'master'Phil Hughes2017-07-213-4/+17
|\ \ \ \ \
| * | | | | Use custom font SVG for logoAnnabel Dunstone Gray2017-07-213-4/+17
* | | | | | Merge branch '35367-speedup-lint-javascript-report-job' into 'master'Kamil Trzciński2017-07-211-0/+2
|\ \ \ \ \ \
| * | | | | | Make the lint:javascript:report job depends on setup-test-env only35367-speedup-lint-javascript-report-jobRémy Coutable2017-07-201-0/+2
* | | | | | | Merge branch 'breadcrumbs-px-height' into 'master'Phil Hughes2017-07-211-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add 1px to breadcrumbs min heightAnnabel Dunstone Gray2017-07-211-1/+1
* | | | | | | Merge branch 'gitaly-tree-entries' into 'master'Rémy Coutable2017-07-215-33/+108
|\ \ \ \ \ \ \
| * | | | | | | Incorporate CommitService.GetTreeEntries Gitaly callgitaly-tree-entriesAlejandro Rodríguez2017-07-205-33/+108
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '34549-extract-devise-mappings-into-helper' into 'master'Rémy Coutable2017-07-216-6/+32
|\ \ \ \ \ \ \
| * | | | | | | Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test h...Jacopo2017-07-206-6/+32
* | | | | | | | Merge branch 'rs-move-mr-slash-command-spec-from-issues' into 'master'Rémy Coutable2017-07-212-26/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Move a spec related to merge requests out of a feature related to issuesrs-move-mr-slash-command-spec-from-issuesRobert Speicher2017-07-202-26/+18
* | | | | | | | | Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master'Robert Speicher2017-07-216-64/+130
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Migrate Gitlab::Git::Commit.find_all to Gitalyfeature/migrate-commit-find-all-to-gitalyAhmad Sherif2017-07-206-64/+130
* | | | | | | | | Merge branch 'improve-ee-compat-check' into 'master'Robert Speicher2017-07-211-6/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Developer can just download the patch from the `ee_compat_check` job's artifactimprove-ee-compat-checkRémy Coutable2017-07-191-6/+7
* | | | | | | | | | Merge branch '28975-recommend-using-v4-api-on-slash-command-integrations' int...Robert Speicher2017-07-213-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Recommend using V4 API on chat slash command integrations28975-recommend-using-v4-api-on-slash-command-integrationsOswaldo Ferreira2017-07-193-3/+3
* | | | | | | | | | | Merge branch '34788-testenv-doesn-t-update-the-component-correctly-when-a-bra...Robert Speicher2017-07-212-20/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improve version handling on component install tasks34788-testenv-doesn-t-update-the-component-correctly-when-a-branch-is-specifiedAlejandro Rodríguez2017-07-202-20/+4
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'Sean McGivern2017-07-213-8/+45
* | | | | | | | | | | Merge branch 'fix/gb/qa/fix-new-project-selectors' into 'master'Rémy Coutable2017-07-215-12/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix new project selectors in GitLab QAfix/gb/qa/fix-new-project-selectorsGrzegorz Bizon2017-07-215-12/+25
* | | | | | | | | | | | Merge branch 'docs/gb/update-background-migrations-development-docs' into 'ma...Sean McGivern2017-07-211-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Copy-edit background migrations guidelinesGrzegorz Bizon2017-07-211-7/+13
| * | | | | | | | | | | | Extend background migration development guidelinesGrzegorz Bizon2017-07-201-0/+30
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'dz-update-grape' into 'master'Sean McGivern2017-07-2123-9/+35
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status