Commits · d310a2d0bc2d51724276e46143f51b11fe03e961 · nexedi / gitlab-ce

22 Oct, 2017 1 commit

Merge branch 'bvl-fix-group-atom-feed' into 'master' · d310a2d0

Douwe Maan authored Oct 22, 2017

Make sure we render events for projects within a group

Closes #39305

See merge request gitlab-org/gitlab-ce!14974

d310a2d0

21 Oct, 2017 39 commits
- Update VERSION to 10.2.0-pre · d90716af
  Stan Hu authored Oct 21, 2017
  
  d90716af
- Update CHANGELOG.md for 10.1.0 · 76e85a84
  Stan Hu authored Oct 21, 2017
```
[ci skip]
```
  76e85a84
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · ff2576e6
  Stan Hu authored Oct 21, 2017
  
  ff2576e6
- Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` · c3ac1c68
  Alessio Caiazza authored Oct 21, 2017
  
  c3ac1c68
- Fix the external URLs generated for online view of HTML artifacts · ef3eb2d9
  Nick Thomas authored Oct 20, 2017
  
  ef3eb2d9
- Use title as placeholder instead of issue title for reusability · 5e93320e
  Clement Ho authored Oct 20, 2017
  
  5e93320e
- Fix failure in current_settings_spec.rb · 6b6fac9e
  Winnie Hellmann authored Oct 20, 2017
  
  6b6fac9e
- Clarify the difference between project_update and project_rename · a6056961
  Joe Marty authored Oct 19, 2017
  
  a6056961
- URI decode Page-Title header to preserve UTF-8 characters · f846abdb
  Toon Claes authored Oct 20, 2017
  
  f846abdb
- Update Gitaly version to v0.49.0 · 0715fa63
  Andrew Newdigate authored Oct 20, 2017
  
  0715fa63
- Decrease Perceived Complexity threshold to 14 · 26b2e613
  Maxim Rydkin authored Oct 20, 2017
  
  26b2e613
- Resolve "Remove help text regarding group issues on group issues page (and... · 23a66ff1
  Victor Wu authored Oct 20, 2017
```
Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
```
  23a66ff1
- Force non diff resolved discussion to display when collapse toggled · c02baddf
  Clement Ho authored Oct 20, 2017
  
  c02baddf
- Added submodule support in multi-file editor · 018542b1
  Phil Hughes authored Oct 20, 2017
  
  018542b1
- add note about after_script being run separately · ce4fece2
  Martin Nowak authored Oct 20, 2017
  
  ce4fece2
- Check for element before evaluate_script · de066111
  Eric Eastwood authored Oct 16, 2017
```
Tip from
https://robots.thoughtbot.com/write-reliable-asynchronous-integration-tests-with-capybara#directly-interacting-with-javascript
```
  de066111
- Merge branch 'master-i18n' into 'master' · 6db9442c
  Douwe Maan authored Oct 19, 2017
```
New Crowdin translations

See merge request gitlab-org/gitlab-ee!3030
```
  6db9442c
- Update Prometheus gem to fix problems with other files overwriting current file · 4611ea23
  Pawel Chojnacki authored Oct 11, 2017
  
  4611ea23
- Prevent ApplicationSetting to cache nil value · 8783c134
  Kamil Trzcinski authored Oct 19, 2017
  
  8783c134
- Remove dropzoneInput from global namespace · 1bba9700
  Filipa Lacerda authored Oct 19, 2017
  
  1bba9700
- Add docs for `api_json.log` file · 0a7ca618
  Stan Hu authored Oct 18, 2017
```
[ci skip]
```
  0a7ca618
- Fix broken function invocation · 9aaa1009
  Filipa Lacerda authored Oct 19, 2017
  
  9aaa1009
- Fix inability to delete container registry tags · fbf82bf4
  Stan Hu authored Oct 18, 2017
```
Because container registry tags can have periods, the addition of the `.json`
format caused ambiguity. Since the tag name regex is greedy, it would attempt
to locate an image named `foo.json` instead of `foo`.

Closes #39260
```
  fbf82bf4
- Document converting `+` to `%2B` in an API query parameter · 5717a1de
  Stan Hu authored Oct 18, 2017
```
[ci skip]
```
  5717a1de
- Renders 404 in commits controller if no commits are found · d3ecf95d
  Guilherme Vieira authored Oct 01, 2017
  
  d3ecf95d
- Avoind unnecesary `force_encoding` operations · 85fbb47b
  Alejandro Rodríguez authored Jun 14, 2017
```
They're costly. This will also avoid some edge cases where
charlock_holmes assigns a weird encoding to a perfectly valid UTF-8
string.
```
  85fbb47b
- Add members flyout on collapsed sidebar · 8e5a12ab
  Annabel Dunstone Gray authored Oct 18, 2017
  
  8e5a12ab
- Update GraphQL licensing situation in the docs · 5d6d7efb
  Nick Thomas authored Oct 18, 2017
  
  5d6d7efb
- Improve the build-package and .review-docs jobs · ae2f5614
  Rémy Coutable authored Oct 17, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ae2f5614
- Reduce Spinach parallelization to 4 nodes and increase RSpec's to 26 nodes · d62582fe
  Rémy Coutable authored Oct 17, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d62582fe
- Improve the .tests-metadata-state definition a bit · bf717f6f
  Rémy Coutable authored Oct 17, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  bf717f6f
- Add a new RSpec::EnvAssignment cop to prevent assigning to ENV in specs · 579af447
  Rémy Coutable authored Oct 11, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  579af447
- Stub ENV in the LDAP task spec file · 68e6a171
  Rémy Coutable authored Oct 10, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  68e6a171
- Stub ENV in the Gitaly task spec file · 19e70e3f
  Rémy Coutable authored Oct 10, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  19e70e3f
- Stub ENV in the backup task spec file · 567baf0e
  Rémy Coutable authored Oct 10, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  567baf0e
- Animate auto devops graphic · be2c6657
  Clement Ho authored Oct 18, 2017
  
  be2c6657
- Use wiki.disk_path · 03beb297
  Nick Thomas authored Oct 18, 2017
  
  03beb297
- Updates google.md to match current version. · 4f62f309
  Werner Beroux authored Oct 09, 2017
  
  4f62f309
- Remove empty lines. [CI skip] · 8bb42855
  Marin Jankovski authored Oct 12, 2017
  
  8bb42855