Commits · f9bb919f5828f755ad50c4e4b80b5d1badab654b · nexedi / gitlab-ce

07 Jun, 2017 13 commits
- Merge remote-tracking branch 'origin-ee/master' into zj-object-store-artifacts · f9bb919f
  Kamil Trzcinski authored Jun 07, 2017
  
  f9bb919f
- Fix test failures · 559a85ec
  Kamil Trzcinski authored Jun 06, 2017
  
  559a85ec
- Add license checks for object storage feature · b27f9848
  Kamil Trzcinski authored Jun 06, 2017
  
  b27f9848
- Add CHANGELOG · 2a5cafe0
  Kamil Trzcinski authored Jun 06, 2017
  
  2a5cafe0
- Update tests · adc84578
  Kamil Trzcinski authored Jun 01, 2017
  
  adc84578
- Properly migrate files · 4a2f8604
  Kamil Trzcinski authored Jun 01, 2017
  
  4a2f8604
- Allow to store artifacts on two storages, internal and external · e268960b
  Kamil Trzcinski authored Jun 01, 2017
  
  e268960b
- Fix migrate_artifacts.rake task (+1 squashed commit) · 98bc4ef5
  Kamil Trzcinski authored May 04, 2017
```
Squashed commits:
[cd77fee] Migrate artifacts to a new storage

- Store information in database what storage is being used by artifacts,
- Artifacts are now stored as `artifacts/project_id/commit_id/job_id`.
```
  98bc4ef5
- Merge branch 'bpj-related-pipelines-graph' into 'master' · 63305cfe
  Filipa Lacerda authored Jun 07, 2017
```
Frontend for cross-project pipeline triggers

See merge request !1985
```
  63305cfe
- Enable nested group test only when nested groups are supported · a3514ce7
  Kamil Trzcinski authored Jun 07, 2017
  
  a3514ce7
- Merge branch 'ee-compat-28340-mass-edit-issues' into 'master' · 091657d4
  Phil Hughes authored Jun 07, 2017
```
EE compatible version of bulk edit sidebar.

See merge request !2025
```
  091657d4
- Fix spec failures · eb24eea9
  Kamil Trzcinski authored Jun 07, 2017
  
  eb24eea9
- Re-add omitted specs. · 7680f95d
  Bryce Johnson authored Jun 06, 2017
  
  7680f95d
06 Jun, 2017 27 commits
- Merge branch 'sh-fix-issue-2555' into 'master' · 6094bc77
  Robert Speicher authored Jun 06, 2017
```
Add primary node clone URL to Geo secondary 'How to work faster with Geo' popover

Closes #2555

See merge request !2027
```
  6094bc77
- Merge branch '2597-fix-master' into 'master' · 2b1e6a44
  Stan Hu authored Jun 06, 2017
```
Resolve "Broken master"

Closes #2597

See merge request !2047
```
  2b1e6a44
- Move issuable bulk edit form into a new sidebar. · 08fcc1e9
  Bryce Johnson authored May 15, 2017
  
  08fcc1e9
- Shush scss_lint and eslint. · ee2b4cee
  Bryce Johnson authored Jun 06, 2017
  
  ee2b4cee
- Remove conflict causing newlines. · 4c3e72ae
  Bryce Johnson authored Jun 06, 2017
  
  4c3e72ae
- Remove conflict causing newlines. · 8587b684
  Bryce Johnson authored Jun 06, 2017
  
  8587b684
- Remove conflict causing newlines. · f125b097
  Bryce Johnson authored Jun 06, 2017
  
  f125b097
- Update specs to match changes, and get passing. · 2dd00ffe
  Bryce Johnson authored Jun 06, 2017
  
  2dd00ffe
- Remove mock code and fix refs to triggered and triggeredBy. · 32b8b8df
  Bryce Johnson authored Jun 06, 2017
  
  32b8b8df
- Merge branch 'sh-make-geo-default-schema-match-config' into 'master' · 7c088a88
  Robert Speicher authored Jun 06, 2017
```
Use the current node configuration to populate suggested new URL for Geo node

Closes #1416

See merge request !2038
```
  7c088a88
- Resolve conflict in doc · e3f322f3
  Rémy Coutable authored Jun 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e3f322f3
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-06-02 · 6cce6d2e
  Rémy Coutable authored Jun 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  6cce6d2e
- Replace wait_for_ajax with wait_for_requests · 511485e6
  Rémy Coutable authored Jun 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  511485e6
- Fix Rubocop offense · 76089b94
  Rémy Coutable authored Jun 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  76089b94
- Fix specs · 9b557562
  Rémy Coutable authored Jun 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9b557562
- triggered_by -> triggeredBy. · 92198c69
  Bryce Johnson authored Jun 06, 2017
  
  92198c69
- Merge branch 'docs/jenkins-split-ee' into 'master' · fbd6831d
  Sean Packham authored Jun 06, 2017
```
Split Jenkins docs

See merge request !2045
```
  fbd6831d
- Split Jenkins docs · 9bd593d7
  Achilleas Pipinellis authored Jun 06, 2017
  
  9bd593d7
- Make graphPosition a required prop. · 27ff6489
  Bryce Johnson authored Jun 06, 2017
  
  27ff6489
- Merge branch 'docs/powershell-ci-vars-ee' into 'master' · bc0882c3
  Sean Packham authored Jun 06, 2017
```
Add PowerShell to CI variable docs

See merge request !2044
```
  bc0882c3
- Remove extra space around pipeline values. · d6694a31
  Bryce Johnson authored Jun 06, 2017
  
  d6694a31
- Remove unused linkedPipelineClass computed. · 31f76576
  Bryce Johnson authored Jun 06, 2017
  
  31f76576
- Use implicit coercion to boolean of triggered and triggeredBy. · c6bb5954
  Bryce Johnson authored Jun 06, 2017
  
  c6bb5954
- Components after props. · 197d622e
  Bryce Johnson authored Jun 06, 2017
  
  197d622e
- Resolve conflicts · 6bebc863
  Rémy Coutable authored Jun 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  6bebc863
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-06-02 · 0674fb62
  Rémy Coutable authored Jun 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0674fb62
- Fix failing specs after project authorizations rework · 4d675052
  Rémy Coutable authored Jun 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  4d675052