Commits · c2834665038c0932e041268a845b86f7c4e55162 · Boxiang Sun / gitlab-ce

26 Apr, 2018 1 commit
- Merge branch 'ide-relative-url-fix' of gitlab.com:gitlab-org/gitlab-ce · c2834665
  Nick Thomas authored Apr 26, 2018
  
  c2834665
25 Apr, 2018 4 commits
- fixed rubocop · 8b321679
  Phil Hughes authored Apr 25, 2018
  
  8b321679
- restore original script_name config · 1d9540cc
  Phil Hughes authored Apr 25, 2018
  
  1d9540cc
- added helper spec · 4b1475b9
  Phil Hughes authored Apr 25, 2018
  
  4b1475b9
- fixed JS service request sending to wrong URL · 0ad5fded
  Phil Hughes authored Apr 25, 2018
  
  0ad5fded
24 Apr, 2018 15 commits
- Merge branch '10244-add-project-ci-cd-settings' into 'master' · f5524d55
  Kamil Trzciński authored Apr 24, 2018
```
Introduce new ProjectCiCdSettings model with group_runners_enabled

See merge request gitlab-org/gitlab-ce!18144
```
  f5524d55
- Merge branch 'fj-45057-improve-ssrf-documentation' into 'master' · 26147b73
  Douwe Maan authored Apr 24, 2018
```
Improve documentation of SSRF protection

Closes #45057

See merge request gitlab-org/gitlab-ce!18532
```
  26147b73
- Improve documentation of SSRF protection · 6d3121be
  Francisco Javier López authored Apr 24, 2018
  
  6d3121be
- Merge branch 'jej/refactor-omniauth-controller' into 'master' · 1e624f34
  Douwe Maan authored Apr 24, 2018
```
Refactor OmniauthCallbacksController to remove duplication

Closes #26559

See merge request gitlab-org/gitlab-ce!16694
```
  1e624f34
- Merge branch 'bvl-warn-if-move-fails-on-mountpoint' into 'master' · d210c6b6
  Douwe Maan authored Apr 24, 2018
```
Warning when restore fails when data-dir is a moint point

Closes #19309

See merge request gitlab-org/gitlab-ce!18533
```
  d210c6b6
- Merge branch 'ide-file-finder' into 'master' · bb8e4268
  Filipa Lacerda authored Apr 24, 2018
```
Added fuzzy file finder to web IDE

Closes #44841

See merge request gitlab-org/gitlab-ce!18323
```
  bb8e4268
- Merge branch 'sh-bump-lograge' into 'master' · b0f7ab7f
  Rémy Coutable authored Apr 24, 2018
```
Bump lograge to 0.10.0 and remove monkey patch

See merge request gitlab-org/gitlab-ce!18551
```
  b0f7ab7f
- Merge branch 'replace-fild-file-tests' into 'master' · fc070ad0
  Rémy Coutable authored Apr 24, 2018
```
Replace find file project spinach tests with RSpec

See merge request gitlab-org/gitlab-ce!18528
```
  fc070ad0
- Replace find file project spinach tests with RSpec · 8ad7cb77
  Semyon Pupkov authored Apr 24, 2018
  
  8ad7cb77
- Merge branch '3064-group-burndown-chart' into 'master' · a544f6ec
  Sean McGivern authored Apr 24, 2018
```
[Backport] EE's Burndown chart for group milestone common code

See merge request gitlab-org/gitlab-ce!18511
```
  a544f6ec
- Merge branch '44447-expose-deploy-token-to-ci-cd' into 'master' · 92cb6d63
  Grzegorz Bizon authored Apr 24, 2018
```
Expose Deploy Token info as environment variables to CI/CD jobs

Closes #44447

See merge request gitlab-org/gitlab-ce!18414
```
  92cb6d63
- Merge branch 'issue_45463' into 'master' · 8a726a08
  Sean McGivern authored Apr 24, 2018
```
Fix users not seeing labels from private groups when being a member of a child project

Closes #45463

See merge request gitlab-org/gitlab-ce!18544
```
  8a726a08
- Merge branch '45688-ci-lint-url-typo' into 'master' · d3db21b4
  Grzegorz Bizon authored Apr 24, 2018
```
Fix docs typo in Validate the .gitlab-ci.yml

Closes #45688

See merge request gitlab-org/gitlab-ce!18552
```
  d3db21b4
- Fixed web IDE not working with relative URLs · 726237ba
  Phil Hughes authored Apr 24, 2018
```
Closes #45649
```
  726237ba
- Merge branch 'master' into 10244-add-project-ci-cd-settings · 1b9c1ac3
  Dylan Griffith authored Apr 24, 2018
  
  1b9c1ac3
23 Apr, 2018 20 commits
- Fix docs typo for ci/lint · fd8547b9
  Takuya Noguchi authored Apr 24, 2018
  
  fd8547b9
- [Backport] Burndown chart for group milestone · b0859a52
  Oswaldo Ferreira authored Apr 20, 2018
  
  b0859a52
- Bump lograge to 0.10.0 and remove monkey patch · 69246ec8
  Stan Hu authored Apr 23, 2018
```
lograge 0.10.0 contains the `Location` query string fix in
https://github.com/roidrage/lograge/pull/241 among other minor changes:
https://github.com/roidrage/lograge/blob/master/CHANGELOG.md
```
  69246ec8
- Merge branch 'mk/add-capybara-debugging-methods-to-docs' into 'master' · 54b97f9c
  Stan Hu authored Apr 23, 2018
```
Add Capybara debugging methods to docs

See merge request gitlab-org/gitlab-ce!18549
```
  54b97f9c
- Add Capybara debugging methods to docs · 407a8004
  Michael Kozono authored Apr 23, 2018
  
  407a8004
- Update CHANGELOG.md for 10.7.1 · c4ccd776
  Mayra Cabrera authored Apr 23, 2018
```
[ci skip]
```
  c4ccd776
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 3569294e
  Mayra Cabrera authored Apr 23, 2018
  
  3569294e
- Merge branch 'update-doorkeeper-changelog' into 'master' · e9b8fb43
  Stan Hu authored Apr 23, 2018
```
Add changelog entry for updating doorkeeper

See merge request gitlab-org/gitlab-ce!18550
```
  e9b8fb43
- Merge branch '45666-project-ci-lint-links' into 'master' · 81e80ae9
  Kamil Trzciński authored Apr 23, 2018
```
Update links to /ci/lint with a new project's ci/lint

Closes #45666

See merge request gitlab-org/gitlab-ce!18539
```
  81e80ae9
- Add missing changelog entry · aa15cada
  Lin Jen-Shin authored Apr 24, 2018
  
  aa15cada
- Merge branch '44775-avatar-on-os-fails-with-cdn' into 'master' · cc0b4e3c
  John Northrup authored Apr 23, 2018
```
Resolve "Avatar URLs are wrong when using a CDN path and Object Storage"

Closes #44775

See merge request gitlab-org/gitlab-ce!18092
```
  cc0b4e3c
- Resolve "Avatar URLs are wrong when using a CDN path and Object Storage" · 741f333d
  Micaël Bergeron authored Apr 23, 2018
  
  741f333d
- Fix users not seeing labels from private groups when being a member of a child project · 2b5ac115
  Felipe Artur authored Apr 23, 2018
  
  2b5ac115
- Merge branch '45433-upgrade-doorkeeper' into 'master' · c0eabb84
  Marin Jankovski authored Apr 23, 2018
```
Update doorkeeper

Closes #45433 and #45647

See merge request gitlab-org/gitlab-ce!18543
```
  c0eabb84
- Update doorkeeper for: · a103cbbe
  Lin Jen-Shin authored Apr 23, 2018
```
https://gitlab.com/gitlab-org/gitlab-ce/issues/45433
and
https://github.com/doorkeeper-gem/doorkeeper/issues/1065
```
  a103cbbe
- Update links to /ci/lint with ones to project ci/lint · ee274f89
  Takuya Noguchi authored Apr 23, 2018
  
  ee274f89
- Merge branch '42936-improve-ns-factory-avoid-duplicates' into 'master' · 2e00c1a7
  Nick Thomas authored Apr 23, 2018
```
Resolve "Namespace factory is problematic"

Closes #42936

See merge request gitlab-org/gitlab-ce!18464
```
  2e00c1a7
- Resolve "Namespace factory is problematic" · ab286656
  Lin Jen-Shin authored Apr 23, 2018
  
  ab286656
- Merge branch '45635-repository-storages-documentation-url-moved' into 'master' · 3d12ce95
  Nick Thomas authored Apr 23, 2018
```
Resolve "Repository storages documentation URL moved"

Closes #45635

See merge request gitlab-org/gitlab-ce!18529
```
  3d12ce95
- Auth::User classes refactor adds should_save? · dd09a19a
  James Edwards-Jones authored Apr 23, 2018
  
  dd09a19a