Commits · e4003ebdb24d178731ff2cfef959cb1e3fbf0a24 · nexedi / gitlab-ce

17 May, 2017 8 commits
- Merge branch 'ce-to-ee-2017-05-10' · e4003ebd
  Rémy Coutable authored May 17, 2017
```
See merge request !1866.
```
  e4003ebd
- Fix conflict in db/schema.rb · a0157215
  Rémy Coutable authored May 17, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a0157215
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-05-10 · a608f214
  Rémy Coutable authored May 17, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a608f214
- Merge branch 'cherry-pick-0663458c-ee' into 'master' · 238a6d76
  Douwe Maan authored May 17, 2017
```
Port of "rename build_events to job_events"

See merge request !1910
```
  238a6d76
- Port of "rename build_events to job_events" · 25ac8aeb
  Bob Van Landuyt authored May 17, 2017
  
  25ac8aeb
- Fix conflict in config/webpack.config.js · 581e7927
  Rémy Coutable authored May 17, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  581e7927
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-05-10 · fb462e2e
  Rémy Coutable authored May 17, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  fb462e2e
- Merge branch '2296-rename-geo-download-dispatch-worker' into 'master' · 2b778174
  Robert Speicher authored May 17, 2017
```
Make cron job name consistent with GeoFileDownloadDispatchWorker

Closes #2296

See merge request !1884
```
  2b778174
16 May, 2017 22 commits
- Make cron job name consistent with GeoFileDownloadDispatchWorker · cfb62a4c
  Douglas Barbosa Alexandre authored May 12, 2017
  
  cfb62a4c
- Manually set MR head_pipeline on approvals test · 47149736
  Oswaldo Ferreira authored May 16, 2017
```
Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10064
```
  47149736
- Merge branch '2274-rename-backfill-services' into 'master' · d702e3e9
  Robert Speicher authored May 16, 2017
```
Geo - Rename backfill service/worker

Closes #2274

See merge request !1883
```
  d702e3e9
- Merge branch 'use-common-vue-for-merge-request-widget-ee' into 'master' · a85912be
  Fatih Acet authored May 16, 2017
```
Port common_vue config changes to EE

See merge request !1909
```
  a85912be
- Merge branch 'ee-modulify-and-tech-debt-gfm-auto-complete' into 'master' · 85c95ece
  Clement Ho authored May 16, 2017
```
Make `gfm_auto_complete` a module and fix up tech debt -- EE merge edition

See merge request !1881
```
  85c95ece
- Make `gfm_auto_complete` a module and fix up tech debt -- EE merge edition · e0a94def
  Eric Eastwood authored May 16, 2017
  
  e0a94def
- Enable RequestStore for PipelinesController#show specs · f78cd547
  Rémy Coutable authored May 16, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f78cd547
- Increase the number of additional queries for PipelinesController#show · 939f0088
  Rémy Coutable authored May 16, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  939f0088
- Merge branch 'docs-add-more-conventions-for-docs-only-tests' into 'master' · aa7b5015
  Rémy Coutable authored May 16, 2017
```
Add more choices to name the branch for docs only tests

See merge request !1908
```
  aa7b5015
- Merge branch '2366-geo-sign-out-broken' into 'master' · 8d7033c3
  Robert Speicher authored May 16, 2017
```
Fix signing out from secondary node when "Remember me" option is checked

Closes #2366

See merge request !1903
```
  8d7033c3
- ensure merge-request-widget utilizes common_vue bundle · e269c3c2
  Mike Greiling authored May 10, 2017
  
  e269c3c2
- ensure schedule_form and schedules_index both utilize common_vue bundle · c0a1dc4f
  Mike Greiling authored May 10, 2017
  
  c0a1dc4f
- ensure filtered_search utilizes common_vue bundle · cb13c6b7
  Mike Greiling authored May 10, 2017
  
  cb13c6b7
- Add more choices to name the branch for docs only tests · 7722075c
  Achilleas Pipinellis authored May 16, 2017
```
http://rubular.com/r/51mKdLm6RF
```
  7722075c
- Merge branch 'ee-add-right-margin-to-ci-error-icon' into 'master' · 40c74cca
  Fatih Acet authored May 16, 2017
```
Port right margin ci error icon fix

See merge request !1906
```
  40c74cca
- Port right margin ci error icon fix · e0c88cc3
  Luke "Jared" Bennett authored May 16, 2017
  
  e0c88cc3
- Merge branch 'ee-32016-escape-instant-comments-and-slash-commands' into 'master' · fdbf646d
  Filipa Lacerda authored May 16, 2017
```
EE - Improve slash command stripping, escape temporary note contents

See merge request !1900
```
  fdbf646d
- EE - Improve slash command stripping, escape temporary note contents · a0c10cd5
  Kushal Pandya authored May 16, 2017
  
  a0c10cd5
- Merge branch 'spec-joining-it' into 'master' · 76ef1edf
  Rémy Coutable authored May 16, 2017
```
[Spec optimization] Joining one-line 'it' blocks (from CE)

See merge request !1902
```
  76ef1edf
- Merge branch 'ee-32125-fix-link-to-note-in-diff' into 'master' · 0a59d7b7
  Fatih Acet authored May 16, 2017
```
Fix linking to resolved note in diff -- EE merge edition

Closes gitlab-ce#32125

See merge request !1901
```
  0a59d7b7
- Merge branch 'ce-to-ee-2017-05-10-template-spec-fix' into 'ce-to-ee-2017-05-10' · 36c117e2
  Rémy Coutable authored May 16, 2017
```
attempt to fix spec

See merge request !1904
```
  36c117e2
- attempt to fix spec · ea0a31dc
  James Lopez authored May 16, 2017
  
  ea0a31dc
15 May, 2017 10 commits
- Add CHANGELOG · bcfcdb33
  Douglas Barbosa Alexandre authored May 15, 2017
  
  bcfcdb33
- Merge branch 'ee-31902-namespace-recent-searches-to-project' into 'master' · b305027d
  Annabel Dunstone Gray authored May 15, 2017
```
Scope recent searches to project -- EE merge edition

Closes gitlab-ce#31902

See merge request !1872
```
  b305027d
- Does not update remember_created_at when in a Geo secondary node · 817a4914
  Douglas Barbosa Alexandre authored May 15, 2017
  
  817a4914
- [Spec optimization] Joining one-line 'it' blocks · 956a4cb8
  Valery Sizov authored May 15, 2017
  
  956a4cb8
- Scope recent searches to project · 19d4f0f5
  Eric Eastwood authored May 05, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31902
```
  19d4f0f5
- Fix linking to resolved note in diff · f9d15c04
  Eric Eastwood authored May 12, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32125
```
  f9d15c04
- Merge branch 'patch-3' into 'master' · 1df30f45
  Valery Sizov authored May 15, 2017
```
Merge request approvals approvers docs

See merge request !1892
```
  1df30f45
- Merge branch 'ee-rename-rendered_title' into 'master' · cbb56475
  Rémy Coutable authored May 15, 2017
```
Apply CE rename-rendered-title patch to EE

See merge request !1898
```
  cbb56475
- Fix JS specs · f1826bcf
  Rémy Coutable authored May 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f1826bcf
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-05-10 · 9a38c2dc
  Rémy Coutable authored May 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9a38c2dc