Commits · a3b3cc22fdb6ab74e5e5dced587d9b16251c3efa · nexedi / gitlab-ce

20 Jan, 2018 6 commits
- Moves remove_remote to a background job · a3b3cc22
  Tiago Botelho authored Jan 09, 2018
  
  a3b3cc22
- Merge branch 'ce-to-ee-2018-01-20' into 'master' · 05d497e1
  Lin Jen-Shin authored Jan 20, 2018
```
CE upstream - Saturday

See merge request gitlab-org/gitlab-ee!4176
```
  05d497e1
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-20 · 0e66a270
  GitLab Bot authored Jan 20, 2018
  
  0e66a270
- Merge branch 'ce-to-ee-2018-01-19' into 'master' · ce166c3a
  Stan Hu authored Jan 20, 2018
```
CE upstream - Friday

See merge request gitlab-org/gitlab-ee!4167
```
  ce166c3a
- Merge branch 'master' into ce-to-ee-2018-01-19 · f969acfe
  Stan Hu authored Jan 19, 2018
  
  f969acfe
- Merge branch '41206-show-signin-pane-after-email-confirmation' into 'master' · 8d6b029e
  Clement Ho authored Jan 20, 2018
```
Resolve "New user is sent back to Register tab after confirming email"

Closes #41206

See merge request gitlab-org/gitlab-ce!16174
```
  8d6b029e
19 Jan, 2018 34 commits
- Merge branch 'evn-remove-outdated-limitation-doc' into 'master' · 92eadbb6
  Stan Hu authored Jan 19, 2018
```
Remove outdated limitation

See merge request gitlab-org/gitlab-ee!4172
```
  92eadbb6
- Merge branch 'ee-dispatcher-projects-mr-creation-new' into 'master' · 7fe1dc43
  Jacob Schatz authored Jan 19, 2018
```
Refactor dispatcher project mr creations new path (EE)

See merge request gitlab-org/gitlab-ee!4031
```
  7fe1dc43
- Remove outdated limitation · 122b364f
  ernstvn authored Jan 19, 2018
  
  122b364f
- Merge branch 'docs/ci-quick-start-typo' into 'master' · 7fa0a3e7
  Marcia Ramos authored Jan 19, 2018
```
Update outdated docs for CI/CD quick start

See merge request gitlab-org/gitlab-ce!16590
```
  7fa0a3e7
- Update outdated docs for CI/CD quick start · 2e4fd61c
  Achilleas Pipinellis authored Jan 19, 2018
```
[ci skip]
```
  2e4fd61c
- Merge branch 'patch-28' into 'master' · e3716e0f
  Achilleas Pipinellis authored Jan 19, 2018
```
Update best_practices.md

See merge request gitlab-org/gitlab-ce!16579
```
  e3716e0f
- Merge branch 'spelling' into 'master' · 9fb5bd41
  Achilleas Pipinellis authored Jan 19, 2018
```
doc: Spelling fixes

See merge request gitlab-org/gitlab-ce!16575
```
  9fb5bd41
- Merge branch 'fix/add-horizontal-scroll-to-wiki-tables' into 'master' · 604c9133
  Annabel Dunstone Gray authored Jan 19, 2018
```
Add horizontal scroll to wiki tables #26557

See merge request gitlab-org/gitlab-ce!16527
```
  604c9133
- Merge branch 'fix_change_log_doc' into 'master' · 97017cea
  Robert Speicher authored Jan 19, 2018
```
Fixes mistake in change log doc.

[ci skip]

See merge request gitlab-org/gitlab-ce!16541
```
  97017cea
- Add horizontal scroll to wiki tables · 0307668c
  George Tsiolis authored Jan 17, 2018
  
  0307668c
- Resolve schema.rb · 45eeb591
  Luke Bennett authored Jan 19, 2018
  
  45eeb591
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-19 · a43b639d
  GitLab Bot authored Jan 19, 2018
```
# Conflicts:
#	db/schema.rb

[ci skip]
```
  a43b639d
- Merge branch 'ce-to-ee-2018-01-19' into 'master' · 76f90950
  Marin Jankovski authored Jan 19, 2018
```
CE upstream - Friday

Closes #1366, gitlab-ce#42157, and gitlab-ce#41989

See merge request gitlab-org/gitlab-ee!4161
```
  76f90950
- Merge branch 'fix-redirect-routes-schema' into 'master' · 1b51018e
  Yorick Peterse authored Jan 19, 2018
```
rework indexes on redirect_routes

See merge request gitlab-org/gitlab-ce!16211
```
  1b51018e
- Update best_practices.md · 408e3cc1
  Anwar El Wakil authored Jan 19, 2018
```
Remove duplicate list item in "General Guidelines" Section.
```
  408e3cc1
- TEMPORARY fix for failures due to missing EE port from... · 44df7165
  Luke Bennett authored Jan 19, 2018
```
TEMPORARY fix for failures due to missing EE port from https://gitlab.com/gitlab-org/gitlab-ce/commit/e79db43d2cf269beec700353e776e92b15ac9af9
```
  44df7165
- Resolve yarn.lock · c1630e6a
  Luke Bennett authored Jan 19, 2018
  
  c1630e6a
- Merge branch 'ee-mr-widget-vue' into 'master' · 1f3e8f4f
  Phil Hughes authored Jan 19, 2018
```
Port of mr-widget-vue to EE

See merge request gitlab-org/gitlab-ee!4160
```
  1f3e8f4f
- Merge branch 'mr-widget-vue' into 'master' · bd245291
  Phil Hughes authored Jan 19, 2018
```
Move archived component to vue file

See merge request gitlab-org/gitlab-ce!16561
```
  bd245291
- Resolve text_utility_spec.js · 2c4c9cb1
  Luke Bennett authored Jan 19, 2018
  
  2c4c9cb1
- Resolve dispatcher.js · 1fd25fcc
  Luke Bennett authored Jan 19, 2018
  
  1fd25fcc
- Resolve notify_spec.rb · a42bb293
  Luke Bennett authored Jan 19, 2018
  
  a42bb293
- Resolve notification_service.rb · 21f53782
  Luke Bennett authored Jan 19, 2018
  
  21f53782
- Resolve merge_requests.rb · 65bbf38e
  Luke Bennett authored Jan 19, 2018
  
  65bbf38e
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-19 · 211e848a
  GitLab Bot authored Jan 19, 2018
```
# Conflicts:
#	app/assets/javascripts/dispatcher.js
#	app/mailers/emails/merge_requests.rb
#	app/services/notification_service.rb
#	spec/javascripts/lib/utils/text_utility_spec.js
#	spec/mailers/notify_spec.rb
#	yarn.lock

[ci skip]
```
  211e848a
- Merge branch '41532-email-reason' into 'master' · e4952f17
  Sean McGivern authored Jan 19, 2018
```
Show why a notification email was sent

Closes #41532 and #1366

See merge request gitlab-org/gitlab-ce!16160
```
  e4952f17
- Merge branch 'ee-41532-email-reason' into 'master' · 565bfe00
  Sean McGivern authored Jan 19, 2018
```
Show why a notification email was sent

See merge request gitlab-org/gitlab-ee!4149
```
  565bfe00
- Merge branch 'sh-fix-authorized-keys-docs' into 'master' · 7805bf29
  Nick Thomas authored Jan 19, 2018
```
Fix incorrect path for gitlab-shell authorized keys helper

See merge request gitlab-org/gitlab-ce!16571
```
  7805bf29
- Merge branch '4411-geo-node-status-rake-task' into 'master' · 04fdd455
  Grzegorz Bizon authored Jan 19, 2018
```
Add rake task to print Geo node status

Closes #4411

See merge request gitlab-org/gitlab-ee!4101
```
  04fdd455
- doc: Spelling fixes · 0cbbb08e
  Ville Skyttä authored Jan 19, 2018
  
  0cbbb08e
- Fix conflict with ee icon · b0152001
  Filipa Lacerda authored Jan 18, 2018
  
  b0152001
- Move archived component to vue file · 301ea209
  Filipa Lacerda authored Jan 18, 2018
  
  301ea209
- Merge branch '26296-update-styling-disabled-buttons' into 'master' · 6aed49bf
  Phil Hughes authored Jan 19, 2018
```
Resolve "Review styling of disabled buttons"

Closes #26296

See merge request gitlab-org/gitlab-ce!16501
```
  6aed49bf
- Merge branch 'tz-fix-ide-bugs' into 'master' · 218136ac
  Phil Hughes authored Jan 19, 2018
```
WebIDE: Fix Commit bugs

See merge request gitlab-org/gitlab-ce!16459
```
  218136ac