Commits · 169674191651864d11bd4b63cc741094b839d9a3 · nexedi / gitlab-ce

02 Apr, 2018 18 commits
- Merge branch 'ce-to-ee-2018-04-01' into 'master' · 16967419
  Lin Jen-Shin (🌙 04-04 ~ 04-08) authored Apr 02, 2018
```
CE upstream - 2018-04-01 15:25 UTC

See merge request gitlab-org/gitlab-ee!5191
```
  16967419
- Merge branch 'master' into ce-to-ee-2018-04-01 · dcfbd99a
  Kushal Pandya authored Apr 02, 2018
  
  dcfbd99a
- Fix for Conflict in api_spec.js · 0477a37c
  Tim Zallmann authored Apr 02, 2018
  
  0477a37c
- Merge branch '5068-roadmap-relayout' into 'master' · 3715a495
  Phil Hughes authored Apr 02, 2018
```
Roadmap markup relayout

Closes #5068 and #4848

See merge request gitlab-org/gitlab-ee!5020
```
  3715a495
- Merge branch 'feature/gb/variables-expressions-in-only-except-ee' into 'master' · e8ce2068
  Kamil Trzciński authored Apr 02, 2018
```
Implement pipeline variables expressions / EE version

See merge request gitlab-org/gitlab-ee!5127
```
  e8ce2068
- Add changelog entry · be7901fb
  Kushal Pandya authored Apr 02, 2018
  
  be7901fb
- Update styles for new rendering implementation · 253b5d56
  Kushal Pandya authored Apr 02, 2018
  
  253b5d56
- Update indicator bar height to ensure it moves past bottom edge · 9b4db6cd
  Kushal Pandya authored Apr 02, 2018
  
  9b4db6cd
- Update template, cleanup methods · 571b56cf
  Kushal Pandya authored Apr 02, 2018
  
  571b56cf
- Update template, move shared code to SectionMixin · 30dfe711
  Kushal Pandya authored Apr 02, 2018
  
  30dfe711
- Update template, add scroll handler · 5e8d48d8
  Kushal Pandya authored Apr 02, 2018
  
  5e8d48d8
- Update template, add mixin, cleanup methods for new template · 7975af2f
  Kushal Pandya authored Apr 02, 2018
  
  7975af2f
- Update template, add itemWidth, cleanup methods · 7339cf59
  Kushal Pandya authored Apr 02, 2018
  
  7339cf59
- Update template · e1513f8f
  Kushal Pandya authored Apr 02, 2018
  
  e1513f8f
- Update template, add itemWidth prop · e7f80ef5
  Kushal Pandya authored Apr 02, 2018
  
  e7f80ef5
- Shared code for Epics list and timeline sections · a25a8c93
  Kushal Pandya authored Apr 02, 2018
  
  a25a8c93
- Add mock values for updated layout · 2768fd26
  Kushal Pandya authored Apr 02, 2018
  
  2768fd26
- Update constants for relayout · 4f896ec1
  Kushal Pandya authored Apr 02, 2018
  
  4f896ec1
01 Apr, 2018 3 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-01 · 436891da
  GitLab Bot authored Apr 01, 2018
```
# Conflicts:
#	spec/javascripts/api_spec.js

[ci skip]
```
  436891da
- Merge branch 'tz-ide-open-mr' into 'master' · 6b89ab11
  Phil Hughes authored Apr 01, 2018
```
Basic Setup for MR Showing

Closes #44840 and #44839

See merge request gitlab-org/gitlab-ce!17952
```
  6b89ab11
- Merge branch 'ee-tz-ide-open-mr' into 'master' · 512a1241
  Phil Hughes authored Apr 01, 2018
```
Open MR in IDE

Closes gitlab-ce#44840 and gitlab-ce#44839

See merge request gitlab-org/gitlab-ee!5147
```
  512a1241
31 Mar, 2018 2 commits
- Merge branch 'ce-to-ee-2018-03-30' into 'master' · e7fe6152
  Stan Hu authored Mar 31, 2018
```
CE upstream - 2018-03-30 18:25 UTC

Closes gitlab-ce#42663

See merge request gitlab-org/gitlab-ee!5187
```
  e7fe6152
- Resolve conflicts in spec/lib/gitlab/import_export/all_models.yml · 952fad90
  Stan Hu authored Mar 30, 2018
  
  952fad90
30 Mar, 2018 17 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-30 · 0d6e9d4e
  GitLab Bot authored Mar 30, 2018
```
# Conflicts:
#	spec/lib/gitlab/import_export/all_models.yml

[ci skip]
```
  0d6e9d4e
- Merge branch 'ce-to-ee-2018-03-30' into 'master' · a9a1e26f
  Rémy Coutable authored Mar 30, 2018
```
CE upstream - 2018-03-30 15:25 UTC

See merge request gitlab-org/gitlab-ee!5185
```
  a9a1e26f
- Merge branch... · d2ad0bcc
  Rémy Coutable authored Mar 30, 2018
```
Merge branch 'theothertom/gitlab-ce-bug/42663/update-jira-integration-docs-for-new-jira-UI-docs' into 'master'

Update Jira integration docs for new Jira UI

Closes #42663

See merge request gitlab-org/gitlab-ce!18107
```
  d2ad0bcc
- Resolve conflict in locale/gitlab.pot · f8a96a0a
  Rémy Coutable authored Mar 30, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f8a96a0a
- Copyedit JIRA docs · dbbc9e67
  Achilleas Pipinellis authored Mar 30, 2018
  
  dbbc9e67
- Resolve conflict in doc/api/jobs.md · 97e580e1
  Rémy Coutable authored Mar 30, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  97e580e1
- Merge branch 'fj-42685-extend-project-export-endpoint' into 'master' · 96cd05e6
  Douwe Maan authored Mar 30, 2018
```
Extend API for exporting a project with direct upload URL

Closes #42685

See merge request gitlab-org/gitlab-ce!17686
```
  96cd05e6
- Extend API for exporting a project with direct upload URL · 22b05a1f
  Francisco Javier López authored Mar 30, 2018
  
  22b05a1f
- Merge branch '41967_issue_api_closed_by_info' into 'master' · 7c36e856
  Sean McGivern authored Mar 30, 2018
```
Add closed by information to issue API

See merge request gitlab-org/gitlab-ce!17042
```
  7c36e856
- Merge branch 'ee-41967_issue_api_closed_by_info' into 'master' · 5b2b4d48
  Sean McGivern authored Mar 30, 2018
```
[port https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17042] Add closed by information to issue API

See merge request gitlab-org/gitlab-ee!4855
```
  5b2b4d48
- Merge branch 'nested-restore-changelog' into 'master' · 4e8bde96
  Douwe Maan authored Mar 30, 2018
```
Add changelog entry for rake task fix

See merge request gitlab-org/gitlab-ce!18112
```
  4e8bde96
- Merge branch 'jramsay-5457-create-project-permissions' into 'master' · 94454101
  Douwe Maan authored Mar 30, 2018
```
Move group create project permissions to Starter

Closes #5457

See merge request gitlab-org/gitlab-ee!5148
```
  94454101
- Merge branch 'mk/geo/fix-inconsistent-project-registry-queries' into 'master' · 360fa69f
  Stan Hu authored Mar 30, 2018
```
Geo: Fix inconsistent project registry queries

Closes #5430

See merge request gitlab-org/gitlab-ee!5171
```
  360fa69f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-30 · 3c2005bf
  GitLab Bot authored Mar 30, 2018
```
# Conflicts:
#	doc/api/jobs.md
#	locale/gitlab.pot

[ci skip]
```
  3c2005bf
- Add changelog entry · 1bfe4933
  Balasankar "Balu" C authored Mar 30, 2018
  
  1bfe4933
- Use events table to feed Burndown data on closed issues · 64c784d2
  oswaldoferreira authored Mar 27, 2018
```
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4855 introduces a
change which nullifies issues.closed_at whenever one reopens a issue.
Which is not currently expected by the burndown charts. Hence we're now
using the events.created_at information.
```
  64c784d2
- Merge branch 'sh-cleanup-pages-worker' into 'master' · 059aca1a
  Nick Thomas authored Mar 30, 2018
```
Free open file descriptors and libgit2 buffers in UpdatePagesService

See merge request gitlab-org/gitlab-ce!18099
```
  059aca1a