Commits · 7373b370f2c5aa33d05dcf459884100f1f39b630 · nexedi / gitlab-ce

11 Apr, 2017 12 commits
- Merge branch 'ee-dm-outdated-diff-link' into 'master' · 7373b370
  Sean McGivern authored Apr 11, 2017
```
EE port of dm-outdated-diff-link

See merge request !1625
```
  7373b370
- Statisfy Robertcop and Seancop · 812907ee
  Douwe Maan authored Apr 11, 2017
  
  812907ee
- Merge branch 'ee-dm-remove-copy-link-on-blame-page' into 'master' · a24beca0
  Robert Speicher authored Apr 11, 2017
```
EE port of dm-remove-copy-link-on-blame-page and dm-remove-copy-link-on-svgs

See merge request !1624
```
  a24beca0
- Add newline · e3793c12
  Douwe Maan authored Apr 11, 2017
  
  e3793c12
- Merge branch '1983-geo-enabled-cache' into 'master' · 6f5b68c5
  Douwe Maan authored Apr 11, 2017
```
Cache Gitlab::Geo queries

Closes #1983

See merge request !1507
```
  6f5b68c5
- Merge branch 'docs-issue-board-focus-mode' into 'master' · 1b88d48d
  Sean McGivern authored Apr 11, 2017
```
Issue board focus mode docs

See merge request !1618
```
  1b88d48d
- Update language [ci skip] · 2ede53ff
  Victor Wu authored Apr 11, 2017
  
  2ede53ff
- Merge branch 'master' into 'ee-dm-remove-copy-link-on-blame-page' · 58c49d9c
  Douwe Maan authored Apr 11, 2017
```
# Conflicts:
#   app/views/projects/blob/_header.html.haml
```
  58c49d9c
- Merge branch 'rc/ce-to-ee-friday' into 'master' · 8eea15c1
  Valery Sizov authored Apr 11, 2017
```
CE upstream - Friday

Closes gitlab-ce#30496, gitlab-ce#27262, and gitlab-ce#29193

See merge request !1605
```
  8eea15c1
- Fix bad resolved conflict for... · 2fde1f95
  Filipa Lacerda authored Apr 11, 2017
```
Fix bad resolved conflict for app/assets/javascripts/environments/folder/environments_folder_view.js
```
  2fde1f95
- Fix wrong conflict resolution · 491b344a
  Rémy Coutable authored Apr 11, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  491b344a
- Merge branch '2117-deploy-board-flickering' into 'master' · dc4945f2
  Jacob Schatz authored Apr 11, 2017
```
Only shows loading for the first request

Closes #2117

See merge request !1620
```
  dc4945f2
10 Apr, 2017 28 commits
- Link to outdated diff in older MR version from outdated diff discussion · ec0b068f
  Douwe Maan authored Apr 10, 2017
  
  ec0b068f
- Fix specs · 4d89f081
  Douwe Maan authored Apr 08, 2017
  
  4d89f081
- Don't show 'Copy content' button on text files that are not rendered as text · d3c0cfa5
  Douwe Maan authored Apr 07, 2017
  
  d3c0cfa5
- Rename displaying_blame to blame · 50608648
  Douwe Maan authored Apr 07, 2017
  
  50608648
- Don't show Copy contents button on Blame page · 3ec81bfa
  Douwe Maan authored Apr 07, 2017
```
# Conflicts:
#	app/views/projects/blob/_header.html.haml
```
  3ec81bfa
- Merge branch 'service-desk-docs' into 'master' · 453cc447
  Achilleas Pipinellis authored Apr 10, 2017
```
Add docs for Service Desk

Closes #2094

See merge request !1586
```
  453cc447
- Resolve FE conflicts · 37565656
  Clement Ho authored Apr 10, 2017
  
  37565656
- Fix Codestyle · f2f0d6da
  Gabriel Mazetto authored Apr 08, 2017
  
  f2f0d6da
- Changelog · 7da43ecf
  Gabriel Mazetto authored Apr 08, 2017
  
  7da43ecf
- Add a short expiration time so we can use on secondary node as well · 708501ea
  Gabriel Mazetto authored Apr 08, 2017
  
  708501ea
- Cache Gitlab::Geo queries · 9409d42f
  Gabriel Mazetto authored Mar 24, 2017
  
  9409d42f
- Only shows loading for the first request · 83033f25
  Filipa Lacerda authored Apr 10, 2017
  
  83033f25
- Update CHANGELOG.md for 9.0.5 · eab9d688
  James Lopez authored Apr 10, 2017
```
[ci skip]
```
  eab9d688
- Update CHANGELOG-EE.md for 9.0.5-ee · a72246f8
  James Lopez authored Apr 10, 2017
```
[ci skip]
```
  a72246f8
- Resolve conflicts on app/assets/javascripts/build.js · 824c1875
  Filipa Lacerda authored Apr 10, 2017
  
  824c1875
- Merge branch '1736-fix-push-rules-git-2-11' into 'master' · 1097eadf
  Robert Speicher authored Apr 10, 2017
```
Fix push rules on Git 2.11

Closes #1736

See merge request !1525
```
  1097eadf
- Focus mode gif [ci skip] · 075fc219
  Victor Wu authored Apr 10, 2017
  
  075fc219
- Delete issue_board_focus_mode.png · 6d79b5fc
  Victor Wu authored Apr 10, 2017
  
  6d79b5fc
- issue board focus mode [ci skip] · d4d7d7c6
  Victor Wu authored Apr 10, 2017
  
  d4d7d7c6
- Merge branch 'geo/update-docs' into 'master' · 59ac3360
  Robert Speicher authored Apr 10, 2017
```
Update Geo docs to reflect what is synced

[ci skip]

See merge request !1603
```
  59ac3360
- Merge branch 'sh-geo-node-ordering' into 'master' · 9b99b3e4
  Robert Speicher authored Apr 10, 2017
```
Order GeoNodes by ID to keep them in the same place

See merge request !1611
```
  9b99b3e4
- [ci skip] Update Geo docs to reflect that is synced · df0526fb
  Douglas Barbosa Alexandre authored Apr 07, 2017
  
  df0526fb
- Fix some conflicts · f7123ed1
  Rémy Coutable authored Apr 10, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f7123ed1
- Merge remote-tracking branch 'origin/master' into rc/ce-to-ee-friday · 183ca39c
  Rémy Coutable authored Apr 10, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  183ca39c
- Merge branch '1738-project-settings-approvals' into 'master' · d6417faa
  Jacob Schatz authored Apr 10, 2017
```
Resolve "Making it easier to configure approvals in project settings"

Closes #1738

See merge request !1527
```
  d6417faa
- issue board focus mode image · 63efc61a
  Victor Wu authored Apr 10, 2017
  
  63efc61a
- Update issue_board.md · b835c3c0
  Victor Wu authored Apr 10, 2017
  
  b835c3c0
- Merge branch 'alkuzad/gitlab-ce-namespaces_encoding_docs' into 'master' · 1ee72757
  Achilleas Pipinellis authored Apr 10, 2017
```
Add information about namespace encoding to API docs

See merge request !1612
```
  1ee72757