Commits · 22efefe7808f4e111ae630e138ad4a1f36bb9696 · nexedi / gitlab-ce

11 Apr, 2017 3 commits
- Added tests and fixed a typo · 22efefe7
  Jose Ivan Vargas authored Apr 11, 2017
  
  22efefe7
- Fix typo on the class merge-when-pipeline_succeeds · 78523461
  Jose Ivan Vargas authored Apr 10, 2017
  
  78523461
- Merge branch '30678-improve-dev-server-process' into 'master' · 19dd138c
  Jacob Schatz authored Apr 11, 2017
```
Make webpack-dev-server process more resilient when switching branches.

Closes #30678

See merge request !10581
```
  19dd138c
10 Apr, 2017 37 commits
- Merge branch 'fix_cache_expiration_in_repository' into 'master' · 100f4370
  Robert Speicher authored Apr 10, 2017
```
Fix redundant cache expiration in Repository

Closes #30146

See merge request !10575
```
  100f4370
- Merge branch 'dm-remove-copy-link-on-svgs' into 'master' · 84da388d
  Robert Speicher authored Apr 10, 2017
```
Don't show 'Copy content' button on text files that are not rendered as text

See merge request !10563
```
  84da388d
- Don't show 'Copy content' button on text files that are not rendered as text · fb8a12c8
  Douwe Maan authored Apr 10, 2017
  
  fb8a12c8
- Merge branch 'rs-fix-doc-anchor-link' into 'master' · 520ed078
  Achilleas Pipinellis authored Apr 10, 2017
```
Fix "Generate new recovery codes using SSH" documentation link

See merge request !10512
```
  520ed078
- Merge branch 'dewet-do-disclaimer' into 'master' · 7ae3001d
  Achilleas Pipinellis authored Apr 10, 2017
```
Disclaimer for testing guide not be be used in prod

See merge request !10468
```
  7ae3001d
- Merge branch '1595-ee-backport-environments-tests' into 'master' · 9c2b0f54
  Clement Ho authored Apr 10, 2017
```
Backport of EE changes in environments tests

See merge request !10528
```
  9c2b0f54
- add CHANGELOG.md entry for !10581 · fa120a06
  Mike Greiling authored Apr 10, 2017
  
  fa120a06
- add license approbals for nodemon dependencies · 6ce9b71c
  Mike Greiling authored Apr 10, 2017
  
  6ce9b71c
- use nodemon to watch for changes to webpack config and restart the dev server when necessary · cb2c762d
  Mike Greiling authored Apr 10, 2017
  
  cb2c762d
- add license approval for ansi-html · dd24066f
  Mike Greiling authored Apr 10, 2017
  
  dd24066f
- watch node_modules for changes when a module is missing · 3812abfa
  Mike Greiling authored Apr 09, 2017
  
  3812abfa
- Merge branch 'backport-ee-1525' into 'master' · 0b5a8a34
  Robert Speicher authored Apr 10, 2017
```
Backport Git-env code from EE "Fix push rules on Git 2.11" (gitlab-org/gitlab-ee!1525)

See merge request !10547
```
  0b5a8a34
- Merge branch 'document-polling-interval' into 'master' · 008e135f
  Stan Hu authored Apr 10, 2017
```
Document how polling interval multiplier is used

Closes #30686

See merge request !10592
```
  008e135f
- Merge branch 'add-vue-loader' into 'master' · d38eae3b
  Filipa Lacerda authored Apr 10, 2017
```
Add vue loader

Closes #29519

See merge request !10517
```
  d38eae3b
- Update CHANGELOG.md for 9.0.5 · 1f0cdabd
  James Lopez authored Apr 10, 2017
```
[ci skip]
```
  1f0cdabd
- Merge branch 'merge-request-parser-merge-requests-for-nodes' into 'master' · 3fda6f52
  Douwe Maan authored Apr 10, 2017
```
Reuse "merge_requests_for_nodes" in "MergeRequestParser"

See merge request !10585
```
  3fda6f52
- Merge branch '25274-gitlab_flow-md-broken-download-link-in-resources' into 'master' · 76cec340
  Achilleas Pipinellis authored Apr 10, 2017
```
Remove broken link on gitlab_flow.md

Closes #25274

See merge request !10590
```
  76cec340
- Document how polling interval is used · 075bdd6c
  Adam Niedzielski authored Apr 10, 2017
  
  075bdd6c
- Merge branch 'todos-docs-update' into 'master' · dbbf4818
  Sean McGivern authored Apr 10, 2017
```
Update todos.md

Closes #30528

See merge request !10557
```
  dbbf4818
- Don't pass `env` anymore to GitAccess, ChangeAccess, and ForcePush · 3de11e1a
  Rémy Coutable authored Apr 05, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3de11e1a
- Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs method · ae88355b
  Rémy Coutable authored Apr 05, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ae88355b
- Retrieve Git-specific env in Gitlab::Git::Repository#rugged · cb20cfa2
  Rémy Coutable authored Apr 05, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  cb20cfa2
- Set Git-specific env in /api/internal/allowed · 710cd82c
  Rémy Coutable authored Apr 05, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  710cd82c
- Add a Gitlab::Git::Env to store Git-specific env thread-safely · 05aa038c
  Rémy Coutable authored Apr 05, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  05aa038c
- Merge branch 'ci-favicon-back-in' into 'master' · 9c576cc7
  Filipa Lacerda authored Apr 10, 2017
```
Added back in the CI status favicon

See merge request !10534
```
  9c576cc7
- Merge branch 'file-view-container' into 'master' · 481f07e7
  Jacob Schatz authored Apr 10, 2017
```
Remove limited container on file view

See merge request !10542
```
  481f07e7
- Merge branch 'alkuzad/gitlab-ce-namespaces_encoding_docs' into 'master' · 6c7b4791
  Achilleas Pipinellis authored Apr 10, 2017
```
Add information about namespace encoding to API docs

Closes #25722

See merge request !10536
```
  6c7b4791
- Add URL encoding link to issues API · 6536e3d5
  Achilleas Pipinellis authored Apr 10, 2017
```
[ci skip]
```
  6536e3d5
- Remove broken link · f328a775
  Sean Packham (GitLab) authored Apr 10, 2017
  
  f328a775
- Merge branch 'spec_for_schema' into 'master' · 9a8ea266
  Rémy Coutable authored Apr 10, 2017
```
Add spec for schema.rb

Closes #21978

See merge request !10580
```
  9a8ea266
- Reuse "merge_requests_for_nodes" in "MergeRequestParser" · 3fa89854
  Adam Niedzielski authored Apr 07, 2017
  
  3fa89854
- Merge branch 'test-all-etag-routes' into 'master' · ce6a48cb
  Sean McGivern authored Apr 10, 2017
```
Test all enabled routes in ETag caching middleware and fix pipeline routes

Closes #30563

See merge request !10535
```
  ce6a48cb
- Merge branch '30676-project-export-email' into 'master' · 94668490
  Sean McGivern authored Apr 10, 2017
```
Fix email not being sent after project export

Closes #30676

See merge request !10578
```
  94668490
- Fixed karma · fede01fb
  Phil Hughes authored Apr 10, 2017
  
  fede01fb
- Fix wrong copy edits for URL-encoded substitutions in API docs · b472f999
  Achilleas Pipinellis authored Apr 08, 2017
  
  b472f999
- Added back in the CI status favicon · 2dab7245
  Phil Hughes authored Apr 07, 2017
```
Looks like it was removed with a bad merge conflict resolution
```
  2dab7245
- Add spec for schema.rb · 171eab81
  blackst0ne authored Apr 10, 2017
  
  171eab81