summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Correct CE-EE parity in two CI-related specsrs-spec-lib-gitlab-ci-parityRobert Speicher2018-06-182-2/+2
* CE-EE parity to spec/lib/gitlab/ci/config_spec.rbRobert Speicher2018-06-181-1/+1
* CE-EE parity to spec/lib/gitlab/ci/yaml_processor_spec.rbRobert Speicher2018-06-181-1/+1
* CE-EE parity for spec/lib/gitlab/ci/pipeline/chain/populate_spec.rbRobert Speicher2018-06-181-1/+1
* Merge branch 'ce-4966-persistent-flash-banner-styles' into 'master'Annabel Gray2018-06-181-0/+14
|\
| * Add styles for persistent notice bannerKushal Pandya2018-06-181-0/+14
|/
* Merge branch 'bvl-i18n-validation' into 'master'Rémy Coutable2018-06-1811-105/+311
|\
| * Correctly translate all forms in testsbvl-i18n-validationBob Van Landuyt2018-06-157-44/+125
| * Add Polish as a supported languageBob Van Landuyt2018-06-151-1/+2
| * Validate if changed translations are checked inBob Van Landuyt2018-06-153-6/+42
| * Interpolate named counts in JSBob Van Landuyt2018-06-151-3/+6
| * Validate PO-variable usage in message idsBob Van Landuyt2018-06-152-0/+26
| * Forbids combining named and unnamed variables in `gitlab.pot`Bob Van Landuyt2018-06-153-81/+140
* | Merge branch '5956-auto-devops-multi-cluster-help-text' into 'master'Clement Ho2018-06-181-2/+4
|\ \
| * | fix links when splitting sentences5956-auto-devops-multi-cluster-help-textDennis Tang2018-06-111-2/+4
* | | Merge branch 'dm-blockquote-trailing-whitespace' into 'master'Sean McGivern2018-06-183-6/+15
|\ \ \
| * | | Allow trailing whitespace on blockquote fence linesDouwe Maan2018-06-183-6/+15
* | | | Merge branch 'dm-favicon-redirect' into 'master'Sean McGivern2018-06-184-0/+8
|\ \ \ \
| * | | | Redirect favicon.(png|ico) to actual favicon asset or uploaddm-favicon-redirectDouwe Maan2018-06-184-0/+8
| |/ / /
* | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-06-181-0/+4
|\ \ \ \
| * | | | Update README.md to clarify EFS is slow and not to use this guide.Lee Matos2018-06-181-0/+4
|/ / / /
* | | | Merge branch 'rails5-fix-db-check' into 'master'Yorick Peterse2018-06-182-1/+6
|\ \ \ \
| * | | | Rails5 fix connection execute return integer instead of stringJasper Maes2018-06-152-1/+6
* | | | | Merge branch 'blackst0ne-rails5-invalid-single-table-inheritance-type-group-i...Yorick Peterse2018-06-182-0/+7
|\ \ \ \ \
| * | | | | [Rails5] Disable inheritance_column for Gitlab::Database::RenameReservedPaths...blackst0ne-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-namespaceblackst0ne2018-06-162-0/+7
* | | | | | Merge branch 'rails5-fix-48012' into 'master'Yorick Peterse2018-06-182-1/+7
|\ \ \ \ \ \
| * | | | | | Rails5 fix passing Group objects array into for_projects_and_groups milestone...Jasper Maes2018-06-162-1/+7
* | | | | | | Merge branch '2211-add-option-to-change-clone-path-docs' into 'master'Achilleas Pipinellis2018-06-181-0/+38
|\ \ \ \ \ \ \
| * | | | | | | Document custom build directoriesSteve Azzopardi2018-06-161-0/+38
| |/ / / / / /
* | | | | | | Merge branch 'docs-coached-20180614-1' into 'master'Achilleas Pipinellis2018-06-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | WIP: fixed broken link to git cheat sheetEdwin Torres2018-06-141-1/+1
* | | | | | | | Merge branch '46429-creating-a-deploy-token-doesn-t-bring-back-to-the-creatio...Fatih Acet2018-06-185-18/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve "Creating a deploy token doesn't bring back to the creation page"Sam Beckham2018-06-185-18/+36
|/ / / / / / / /
* | | | | | | | Merge branch '47672-set_inline_content_type_for_ics' into 'master'Douwe Maan2018-06-187-42/+87
|\ \ \ \ \ \ \ \
| * | | | | | | | Render calendar feed inline when accessed from GitLabImre Farkas2018-06-187-42/+87
* | | | | | | | | Merge branch 'blackst0ne-rails5-expected-the-response-to-have-status-code-ok-...Rémy Coutable2018-06-182-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [Rails5] Set request.format for artifacts_controllerblackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404blackst0ne2018-06-162-0/+14
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rails5-fix-48009' into 'master'Rémy Coutable2018-06-182-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rails5 update Gemfile.rails5.lockJasper Maes2018-06-162-2/+7
| |/ / / / / / / /
* | | | | | | | | Merge branch 'blackst0ne-rails5-expected-search-search-seed_project-got-nil' ...Rémy Coutable2018-06-182-5/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [Rails5] Fix sessions_controller_specblackst0ne-rails5-expected-search-search-seed_project-got-nilblackst0ne2018-06-162-5/+10
| |/ / / / / / / /
* | | | | | | | | Merge branch 'blackst0ne-rails5-fix-pipeline-schedules-controller-spec' into ...Rémy Coutable2018-06-182-3/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [Rails5] Fix pipeline_schedules_controller_specblackst0ne-rails5-fix-pipeline-schedules-controller-specblackst0ne2018-06-162-3/+18
* | | | | | | | | | Merge branch 'expose-clean-backtrace-method-from-profiler' into 'master'Rémy Coutable2018-06-182-5/+53
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Expose a clean_backtrace method from Gitlab::Profilerexpose-clean-backtrace-method-from-profilerSean McGivern2018-06-152-5/+53
* | | | | | | | | | Merge branch 'rails5-fix-47960' into 'master'Rémy Coutable2018-06-182-4/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rails5 fix update_attribute usage not causing a saveJasper Maes2018-06-152-4/+9
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-blob-requests-format' into 'master'Rémy Coutable2018-06-182-0/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [Rails5] Explicitly set request.format for blob_controllerblackst0ne-rails5-fix-blob-requests-formatblackst0ne2018-06-152-0/+18
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '47933-MR-invisible-milestone' into 'master'Douwe Maan2018-06-185-6/+23
|\ \ \ \ \ \ \ \ \ \