summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '39189-online-view-of-html-artifacts-is-broken' into 'master'27375-dashboardcontroller-activity-json-is-slow-due-to-sqlGrzegorz Bizon2017-10-213-10/+19
|\
| * Fix the external URLs generated for online view of HTML artifactsNick Thomas2017-10-203-10/+19
* | Merge branch 'docs/ci-disposable-environment' into 'master'Achilleas Pipinellis2017-10-211-0/+2
|\ \ | |/ |/|
| * Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`Alessio Caiazza2017-10-211-0/+2
|/
* Merge branch 'multi-file-editor-submodules' into 'master'Filipa Lacerda2017-10-208-5/+75
|\
| * Added submodule support in multi-file editorPhil Hughes2017-10-208-5/+75
* | Merge branch 'use-title' into 'master'Filipa Lacerda2017-10-204-7/+12
|\ \
| * | Use title as placeholder instead of issue title for reusabilityClement Ho2017-10-204-7/+12
|/ /
* | Merge branch 'fix-application-setting-nil-cache' into 'master'Winnie Hellmann2017-10-204-2/+25
|\ \
| * | Fix failure in current_settings_spec.rbfix-application-setting-nil-cacheWinnie Hellmann2017-10-201-1/+1
| * | Prevent ApplicationSetting to cache nil valueKamil Trzcinski2017-10-193-1/+24
* | | Merge branch 'feature/reliable-rspec-with-eval-script' into 'master'Rémy Coutable2017-10-2015-20/+39
|\ \ \
| * | | Check for element before evaluate_scriptEric Eastwood2017-10-1915-20/+39
* | | | Merge branch 'fix-system-hook-docs' into 'master'Sean McGivern2017-10-202-0/+7
|\ \ \ \
| * | | | Clarify the difference between project_update and project_renameJoe Marty2017-10-202-0/+7
* | | | | Merge branch 'maintenance_policy' into 'master'Achilleas Pipinellis2017-10-202-33/+82
|\ \ \ \ \
| * | | | | Remove empty lines. [CI skip]maintenance_policyMarin Jankovski2017-10-121-2/+0
| * | | | | Change location of the maintenance policy document. Add version support infor...Marin Jankovski2017-10-112-33/+84
* | | | | | Merge branch 'tc-page-title-encoding-fix' into 'master'Winnie Hellmann2017-10-203-2/+16
|\ \ \ \ \ \
| * | | | | | URI decode Page-Title header to preserve UTF-8 charactersToon Claes2017-10-203-2/+16
|/ / / / / /
* | | | | | Merge branch 'gitaly-version-v0.49.0' into 'master'Rémy Coutable2017-10-201-1/+1
|\ \ \ \ \ \
| * | | | | | Update Gitaly version to v0.49.0Andrew Newdigate2017-10-201-1/+1
|/ / / / / /
* | | | | | Merge branch '31358_decrease_perceived_complexity_threshold_step3' into 'master'Rémy Coutable2017-10-203-9/+27
|\ \ \ \ \ \
| * | | | | | Decrease Perceived Complexity threshold to 14Maxim Rydkin2017-10-203-9/+27
|/ / / / / /
* | | | | | Merge branch '39297-remove-help-text-regarding-group-issues-on-group-issues-p...Sean McGivern2017-10-203-14/+5
|\ \ \ \ \ \
| * | | | | | Resolve "Remove help text regarding group issues on group issues page (and gr...Victor Wu2017-10-203-14/+5
|/ / / / / /
* | | | | | Merge branch 'rc/cleanup-some-jobs' into 'master'Robert Speicher2017-10-201-9/+1
|\ \ \ \ \ \
| * | | | | | Improve the build-package and .review-docs jobsrc/cleanup-some-jobsRémy Coutable2017-10-181-9/+1
* | | | | | | Merge branch 'fix-non-diff-resolved-discussion' into 'master'Phil Hughes2017-10-203-7/+29
|\ \ \ \ \ \ \
| * | | | | | | Force non diff resolved discussion to display when collapse toggledClement Ho2017-10-203-7/+29
|/ / / / / / /
* | | | | | | Merge branch '37391-wiki-disk-path-helper' into 'master'Nick Thomas2017-10-204-4/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Use wiki.disk_pathNick Thomas2017-10-184-4/+4
* | | | | | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-10-201-0/+6
|\ \ \ \ \ \ \
| * | | | | | | add note about after_script being run separatelyMartin Nowak2017-10-201-0/+6
|/ / / / / / /
* | | | | | | Merge branch 'animate-auto-devops' into 'master'Annabel Dunstone Gray2017-10-203-2/+18
|\ \ \ \ \ \ \
| * | | | | | | Animate auto devops graphicanimate-auto-devopsClement Ho2017-10-183-2/+18
* | | | | | | | Merge branch 'update-nav-sidebar-hover' into 'master'Annabel Dunstone Gray2017-10-191-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | update nav sidebar hover color to increase contrastupdate-nav-sidebar-hovertauriedavis2017-10-111-3/+3
* | | | | | | | Merge branch 'docs/Wernight/gitlab-ce-patch-28' into 'master'Achilleas Pipinellis2017-10-191-19/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Updates google.md to match current version.docs/Wernight/gitlab-ce-patch-28Werner Beroux2017-10-171-19/+0
* | | | | | | | | Merge branch 'sh-document-plus-encoding-api' into 'master'Achilleas Pipinellis2017-10-191-0/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Document converting `+` to `%2B` in an API query parametersh-document-plus-encoding-apiStan Hu2017-10-181-0/+17
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-api-json-logs' into 'master'Achilleas Pipinellis2017-10-191-2/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add docs for `api_json.log` filesh-api-json-logsStan Hu2017-10-181-2/+22
* | | | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2017-10-1915-1147/+8176
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'master-i18n' into 'master'Douwe Maan2017-10-1915-1147/+8176
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' ...Stan Hu2017-10-192-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update Prometheus gem to fix problems with other files overwriting current filePawel Chojnacki2017-10-192-3/+3
* | | | | | | | | | | Merge branch 'rc/balance-test-job-nodes' into 'master'Robert Speicher2017-10-191-63/+63
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Reduce Spinach parallelization to 4 nodes and increase RSpec's to 26 nodesrc/balance-test-job-nodesRémy Coutable2017-10-181-63/+63
| | |_|/ / / / / / / / | |/| | | | | | | | |