Commits · f63257575b0a58f29c8a9bb3d15364ee007d3ab9 · nexedi / gitlab-ce

06 Sep, 2017 5 commits
- Fix invalid constant names related to git operations · f6325757
  Dmitriy Zaporozhets authored Sep 06, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f6325757
- Fix issuable serializer use · 0313235b
  Dmitriy Zaporozhets authored Sep 06, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0313235b
- Resolve CE/EE conflicts in notification specs · dc9e4d04
  Grzegorz Bizon authored Sep 06, 2017
  
  dc9e4d04
- Resolve conflicts from CE to EE merge · 572b8931
  Gabriel Mazetto authored Sep 06, 2017
  
  572b8931
- Fix syntax error in app/assets/stylesheets/pages/pipelines.scss · ec8363d2
  Dmitriy Zaporozhets authored Sep 06, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ec8363d2
05 Sep, 2017 35 commits
- [ci skip] Resolve conflicts in doc/api/issues.md · 7ecf5c01
  Dmitriy Zaporozhets authored Sep 05, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7ecf5c01
- Fix pipeline border variable · c4fdfb7a
  Dmitriy Zaporozhets authored Sep 05, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c4fdfb7a
- Resolve conflicts from moving move issues button · b4ca6df7
  Eric Eastwood authored Sep 05, 2017
  
  b4ca6df7
- Resolve conflicts ci/build.rb, api/entities.rb · d7e8c80d
  Kamil Trzcinski authored Sep 05, 2017
  
  d7e8c80d
- Fix `doc/api/settings.md` conflicts · b0ad8db0
  Bob Van Landuyt authored Sep 05, 2017
```
by adding the `_key_restriction` attributes.
```
  b0ad8db0
- Resolve conflicts in `utils` and `utils_spec` · 5292d833
  Bob Van Landuyt authored Sep 05, 2017
  
  5292d833
- Update schema.rb · 403a4d7e
  Shinya Maeda authored Sep 05, 2017
  
  403a4d7e
- Update safe_model_attributes.yml · f99ef077
  Shinya Maeda authored Sep 05, 2017
  
  f99ef077
- Update retry_build_service_spec.rb · 0bdf082f
  Shinya Maeda authored Sep 05, 2017
  
  0bdf082f
- Resolve conflicts · b758d365
  Nick Thomas authored Sep 05, 2017
  
  b758d365
- Resolve conflict in merge_requests.scss · a4b45066
  winh authored Sep 05, 2017
  
  a4b45066
- resolve conflicts for ce to ee merge · c9193e7e
  Jarka Kadlecova authored Sep 05, 2017
  
  c9193e7e
- Resolve conflict in projects.scss · 8d60ebbb
  winh authored Sep 05, 2017
  
  8d60ebbb
- Resolve conflict in selects.scss · 9d720c47
  winh authored Sep 05, 2017
  
  9d720c47
- Merge remote-tracking branch 'ce-com/master' into ce-to-ee · 50fae638
  Dmitriy Zaporozhets authored Sep 05, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  50fae638
- Merge branch 'ce-to-ee-2017-09-01' into 'master' · 272abb33
  Dmitriy Zaporozhets authored Sep 05, 2017
```
CE upstream: Friday

Closes gitaly#184, gitaly#219, #3298, gitaly#486, gitlab-ce#37194, and gitlab-ce#34864

See merge request !2806
```
  272abb33
- Merge branch 'issue-api-my-reaction' into 'master' · dd157e45
  Sean McGivern authored Sep 05, 2017
```
Add my_reaction_emoji param to /issues and /merge_requests API

See merge request !14016
```
  dd157e45
- Merge branch 'feature/sm/34518-extend-api-pipeline-schedule-variable-new' into 'master' · 6523ba1d
  Kamil Trzciński authored Sep 05, 2017
```
Extend API: Pipeline Schedule Variable

Closes #34518

See merge request !13653
```
  6523ba1d
- Merge branch... · 3d61421f
  Kamil Trzciński authored Sep 05, 2017
```
Merge branch 'fix/sm/35650-remove-createtriggerrequestservice-and-forbid-to-persist-variables-on-ci-triggerrequest' into 'master'

Removes `CreateTriggerRequestService` and add a blocker to prevent saving variables on `Ci::TriggerRequest`

Closes #35650

See merge request !13792
```
  3d61421f
- Merge branch 'feature/sm/37239-implement-failure_reason-on-ci_builds' into 'master' · 89efaf2a
  Kamil Trzciński authored Sep 05, 2017
```
Implement `failure_reason` on `ci_builds`

Closes #37239

See merge request !13937
```
  89efaf2a
- Merge branch 'feature/sm/33281-protected-runner-executes-jobs-on-protected-branch-ee' into 'master' · 75d710bc
  Kamil Trzciński authored Sep 05, 2017
```
Port "Protected runner executes jobs on protected branch [Solution 1]" to EE

See merge request !2820
```
  75d710bc
- Merge branch 'docs/gb/fix-ci-cd-types-removal-due-date' into 'master' · 1aa8b38c
  Grzegorz Bizon authored Sep 05, 2017
```
Fix CI/CD `types` config entry removal due date

See merge request !13990
```
  1aa8b38c
- Merge branch 'additional-time-series-charts' into 'master' · 83eb2626
  Tim Zallmann authored Sep 05, 2017
```
Added support for additional time series charts

Closes #33345

See merge request !13159
```
  83eb2626
- Fix CI/CD `types` config entry removal due date · aeff56cb
  Grzegorz Bizon authored Sep 01, 2017
  
  aeff56cb
- Merge branch 'winh-move-issue-project-dropdown' into 'master' · fb9f1e3a
  Phil Hughes authored Sep 05, 2017
```
Make project selection dropdown for issue editing consistent

See merge request !13574
```
  fb9f1e3a
- Merge branch 'winh-transfer-project-dropdown' into 'master' · d4ec6318
  Phil Hughes authored Sep 05, 2017
```
Make transfer project dropdown in project settings consistent

See merge request !13596
```
  d4ec6318
- Merge branch 'winh-mirror-user-dropdown' into 'master' · f60f6872
  Phil Hughes authored Sep 05, 2017
```
Make mirror user dropdown in project settings consistent

See merge request !2706
```
  f60f6872
- Merge branch 'winh-merge-request-target-branch-dropdown-ee' into 'master' · c10c5134
  Phil Hughes authored Sep 05, 2017
```
Make target branch dropdown on merge request edit page consistent

See merge request !2805
```
  c10c5134
- Merge branch 'winh-merge-request-target-branch-dropdown' into 'master' · 816f249a
  Phil Hughes authored Sep 05, 2017
```
Make target branch dropdown on merge request edit page consistent

See merge request !13592
```
  816f249a
- Merge branch 'winh-protection-dropdowns-ee' into 'master' · 79fcabca
  Phil Hughes authored Sep 05, 2017
```
Make protected branches / tags permission dropdowns consistent

See merge request !2781
```
  79fcabca
- Merge branch 'winh-protection-dropdowns' into 'master' · 4a98420f
  Phil Hughes authored Sep 05, 2017
```
Make protected branches / tags permission dropdowns consistent

See merge request !13611
```
  4a98420f
- Merge branch 'winh-issue-form-dropdowns' into 'master' · d4dd6b08
  Phil Hughes authored Sep 05, 2017
```
Make dropdowns on new issue page consistent

See merge request !13584
```
  d4dd6b08
- Merge branch 'winh-note-form-dropdown' into 'master' · 25600b19
  Phil Hughes authored Sep 05, 2017
```
Make comment form dropdown style consistent

See merge request !13473
```
  25600b19
- Merge branch 'winh-text-danger-selector' into 'master' · 2ca7f90a
  Phil Hughes authored Sep 05, 2017
```
Avoid @extend for .text-danger in dropdowns

Closes #37396

See merge request !14030
```
  2ca7f90a
- Merge branch 'vue-docs' into 'master' · 2db0e4c6
  Phil Hughes authored Sep 05, 2017
```
Adds documentation to use Vuex

Closes #36070

See merge request !13931
```
  2db0e4c6