Commits · 188e860804285f6d54140df54d8fa62a15f99dc9 · nexedi / gitlab-ce

20 Oct, 2017 26 commits
- Hides pipeline duration in commit box when it is zero (nil) · 188e8608
  Guilherme Vieira authored Oct 20, 2017
  
  188e8608
- Merge branch 'multi-file-editor-submodules' into 'master' · e1122c9f
  Filipa Lacerda authored Oct 20, 2017
```
Added submodule support in multi-file editor

See merge request gitlab-org/gitlab-ce!14971
```
  e1122c9f
- Merge branch 'use-title' into 'master' · 3b54907f
  Filipa Lacerda authored Oct 20, 2017
```
Use title as placeholder instead of issue title for reusability

Closes gitlab-ee#3781

See merge request gitlab-org/gitlab-ce!14927
```
  3b54907f
- Use title as placeholder instead of issue title for reusability · 59c03de5
  Clement Ho authored Oct 20, 2017
  
  59c03de5
- Merge branch 'fix-application-setting-nil-cache' into 'master' · 81175d2c
  Winnie Hellmann authored Oct 20, 2017
```
Prevent ApplicationSetting to cache nil value

Closes #39275

See merge request gitlab-org/gitlab-ce!14952
```
  81175d2c
- Merge branch 'feature/reliable-rspec-with-eval-script' into 'master' · cc8af554
  Rémy Coutable authored Oct 20, 2017
```
Check for element before execute_script

See merge request gitlab-org/gitlab-ce!14898
```
  cc8af554
- Fix failure in current_settings_spec.rb · beeed14f
  Winnie Hellmann authored Oct 20, 2017
  
  beeed14f
- Merge branch 'fix-system-hook-docs' into 'master' · 82397f38
  Sean McGivern authored Oct 20, 2017
```
Clarify system hook docs

See merge request gitlab-org/gitlab-ce!14957
```
  82397f38
- Clarify the difference between project_update and project_rename · 81eb4ad3
  Joe Marty authored Oct 19, 2017
  
  81eb4ad3
- Merge branch 'maintenance_policy' into 'master' · 2c66ea01
  Achilleas Pipinellis authored Oct 20, 2017
```
Change location of the maintenance policy document

See merge request gitlab-org/gitlab-ce!14813
```
  2c66ea01
- Merge branch 'tc-page-title-encoding-fix' into 'master' · 85c20160
  Winnie Hellmann authored Oct 20, 2017
```
URI decode Page-Title header to preserve UTF-8 characters

Closes #39179

See merge request gitlab-org/gitlab-ce!14929
```
  85c20160
- URI decode Page-Title header to preserve UTF-8 characters · d8d7faf6
  Toon Claes authored Oct 20, 2017
  
  d8d7faf6
- Merge branch 'gitaly-version-v0.49.0' into 'master' · f3117e79
  Rémy Coutable authored Oct 20, 2017
```
Update Gitaly version to v0.49.0

See merge request gitlab-org/gitlab-ce!14943
```
  f3117e79
- Update Gitaly version to v0.49.0 · 2cf63dbb
  Andrew Newdigate authored Oct 20, 2017
  
  2cf63dbb
- Merge branch '31358_decrease_perceived_complexity_threshold_step3' into 'master' · 2fe33992
  Rémy Coutable authored Oct 20, 2017
```
Decrease Perceived Complexity threshold to 14

See merge request gitlab-org/gitlab-ce!14231
```
  2fe33992
- Decrease Perceived Complexity threshold to 14 · 239b2748
  Maxim Rydkin authored Oct 20, 2017
  
  239b2748
- Merge branch... · 8c79310e
  Sean McGivern authored Oct 20, 2017
```
Merge branch '39297-remove-help-text-regarding-group-issues-on-group-issues-page-and-group-merge-requests-page' into 'master'

Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"

Closes #39297

See merge request gitlab-org/gitlab-ce!14963
```
  8c79310e
- Resolve "Remove help text regarding group issues on group issues page (and... · 775c43cc
  Victor Wu authored Oct 20, 2017
```
Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
```
  775c43cc
- Merge branch 'rc/cleanup-some-jobs' into 'master' · 40ded704
  Robert Speicher authored Oct 20, 2017
```
Improve the build-package and .review-docs jobs

See merge request gitlab-org/gitlab-ce!14938
```
  40ded704
- Merge branch 'fix-non-diff-resolved-discussion' into 'master' · 9c3f094a
  Phil Hughes authored Oct 20, 2017
```
Force non diff resolved discussion to display when collapse toggled

Closes #39187

See merge request gitlab-org/gitlab-ce!14946
```
  9c3f094a
- Force non diff resolved discussion to display when collapse toggled · 04b616a6
  Clement Ho authored Oct 20, 2017
  
  04b616a6
- Added submodule support in multi-file editor · 74123332
  Phil Hughes authored Oct 20, 2017
  
  74123332
- Merge branch '37391-wiki-disk-path-helper' into 'master' · bc734d34
  Nick Thomas authored Oct 20, 2017
```
Use wiki.disk_path

See merge request gitlab-org/gitlab-ce!14930
```
  bc734d34
- Merge branch 'patch-24' into 'master' · b4dc0ba2
  Rémy Coutable authored Oct 20, 2017
```
add note about after_script being run separately

See merge request gitlab-org/gitlab-ce!13689
```
  b4dc0ba2
- add note about after_script being run separately · 37500cb7
  Martin Nowak authored Oct 20, 2017
  
  37500cb7
- Merge branch 'animate-auto-devops' into 'master' · a4416c39
  Annabel Dunstone Gray authored Oct 20, 2017
```
Animate auto devops graphic

Closes #39242

See merge request gitlab-org/gitlab-ce!14931
```
  a4416c39
19 Oct, 2017 14 commits
- Merge branch 'update-nav-sidebar-hover' into 'master' · bd39b441
  Annabel Dunstone Gray authored Oct 19, 2017
```
Update nav sidebar hover color to increase contrast

Closes #37660

See merge request gitlab-org/gitlab-ce!14829
```
  bd39b441
- Check for element before evaluate_script · 43377979
  Eric Eastwood authored Oct 16, 2017
```
Tip from
https://robots.thoughtbot.com/write-reliable-asynchronous-integration-tests-with-capybara#directly-interacting-with-javascript
```
  43377979
- Merge branch 'docs/Wernight/gitlab-ce-patch-28' into 'master' · 490cce63
  Achilleas Pipinellis authored Oct 19, 2017
```
Updates google.md to match current version.

See merge request gitlab-org/gitlab-ce!14912
```
  490cce63
- Merge branch 'sh-document-plus-encoding-api' into 'master' · ed339b69
  Achilleas Pipinellis authored Oct 19, 2017
```
Document converting `+` to `%2B` in an API query parameter

See merge request gitlab-org/gitlab-ce!14948
```
  ed339b69
- Merge branch 'sh-api-json-logs' into 'master' · 16998e2e
  Achilleas Pipinellis authored Oct 19, 2017
```
Add docs for `api_json.log` file

See merge request gitlab-org/gitlab-ce!14950
```
  16998e2e
- Merge branch 'bvl-port-of-ee-translations' into 'master' · b9890c4c
  Douwe Maan authored Oct 19, 2017
```
CE port of EE translations

See merge request gitlab-org/gitlab-ce!14954
```
  b9890c4c
- Merge branch 'master-i18n' into 'master' · ef546785
  Douwe Maan authored Oct 19, 2017
```
New Crowdin translations

See merge request gitlab-org/gitlab-ee!3030
```
  ef546785
- Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' into 'master' · f73efb79
  Stan Hu authored Oct 19, 2017
```
Update Prometheus gem to fix problems with other Processes overwriting current metrics file

Closes #36714

See merge request gitlab-org/gitlab-ce!14827
```
  f73efb79
- Merge branch 'rc/balance-test-job-nodes' into 'master' · cccb5322
  Robert Speicher authored Oct 19, 2017
```
Reduce Spinach parallelization to 4 nodes and increase RSpec's to 26 nodes

See merge request gitlab-org/gitlab-ce!14936
```
  cccb5322
- Merge branch 'rc/reduce-duplication-in-tests-metadata-state-job-definition' into 'master' · 8a987b65
  Robert Speicher authored Oct 19, 2017
```
Improve the .tests-metadata-state definition a bit

See merge request gitlab-org/gitlab-ce!14937
```
  8a987b65
- Update Prometheus gem to fix problems with other files overwriting current file · f9a4f184
  Pawel Chojnacki authored Oct 11, 2017
  
  f9a4f184
- Merge branch '18765-stub_env_in_specs' into 'master' · b5e7035c
  Robert Speicher authored Oct 19, 2017
```
Resolve "Add a 'custom cop' to RuboCop that bans ENV assignment"

Closes #18765

See merge request gitlab-org/gitlab-ce!14810
```
  b5e7035c
- Merge branch 'not-found-in-commits' into 'master' · 228bbb3a
  Douwe Maan authored Oct 19, 2017
```
Renders 404 in commits controller if no commits are found

Closes #37620

See merge request gitlab-org/gitlab-ce!14610
```
  228bbb3a
- Merge branch '34754-graphql-policy-update' into 'master' · ac782f56
  Douwe Maan authored Oct 19, 2017
```
Update GraphQL licensing situation in the docs

See merge request gitlab-org/gitlab-ce!14940
```
  ac782f56