delta/gitlab/gitlab-ce.git/db/migrate, branch bootstrap-markdown-code-highlight gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'sh-bump-ruby-2.4' into 'master' 2018-06-01T17:59:04+00:00 Stan Hu stanhu@gmail.com 2018-06-01T17:59:04+00:00 81e899ea7141b34a7860f308327249784fb5d6cc Upgrade to Ruby 2.4.4 See merge request gitlab-org/gitlab-ce!19055 
Upgrade to Ruby 2.4.4

See merge request gitlab-org/gitlab-ce!19055
 Merge branch '46487-add-support-for-jupyter-in-gitlab-via-kubernetes' into 'master' 2018-06-01T07:58:18+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2018-06-01T07:58:18+00:00 d68ded2122f899bc0f478253652c4a082c98ec60 Resolve "Add support for Jupyter in GitLab via Kubernetes" Closes #46487 See merge request gitlab-org/gitlab-ce!19019 
Resolve "Add support for Jupyter in GitLab via Kubernetes"

Closes #46487

See merge request gitlab-org/gitlab-ce!19019
 Improve jupyter app db migrations 2018-05-31T14:01:33+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2018-05-31T14:01:33+00:00 0b2ca23b9c82bfc728d6ab386ca93ecd51bafcaa Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Export assigned issues in iCalendar feed 2018-05-31T14:01:04+00:00 Imre Farkas ifarkas@gitlab.com 2018-05-31T14:01:04+00:00 20dfe25c151cc883ce0d38b67125b5ca41e6d422 






Merge remote-tracking branch 'origin/master' into 46487-add-support-for-jupyter-in-gitlab-via-kubernetes
2018-05-30T11:26:54+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2018-05-30T11:26:54+00:00

ef5282ee368ba15207c86b67bf224b3b54efcce1












Rename clusters_applications_jupyters to uncountable
2018-05-30T09:09:12+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2018-05-30T09:09:12+00:00

db9f765852d9fef464e69c0bf47a382f2ab7219d

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'
2018-05-30T07:38:31+00:00

Phil Hughes
me@iamphill.com

2018-05-30T07:38:31+00:00

fd79df64c5411308e67a62b4c02a07f5317ddec1

Resolve "Squash and merge in GitLab Core (CE)"

Closes #34591

See merge request gitlab-org/gitlab-ce!18956




Resolve "Squash and merge in GitLab Core (CE)"

Closes #34591

See merge request gitlab-org/gitlab-ce!18956






Upgrade to Ruby 2.4.4
2018-05-29T22:19:33+00:00

Stan Hu
stanhu@gmail.com

2018-05-19T13:03:29+00:00

b5c706326ada2c0d213dd512842c5f677d9d94f9

Fixes that make this work:

* A change in Ruby (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1)
requires passing in the exact required length for OpenSSL keys and IVs.

* Ensure the secrets.yml is generated before any prepended modules are
loaded. This is done by renaming the `secret_token.rb` initializer to
`01_secret_token.rb`, which is a bit ugly but involves the least impact on
other files.





Fixes that make this work:

* A change in Ruby (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1)
requires passing in the exact required length for OpenSSL keys and IVs.

* Ensure the secrets.yml is generated before any prepended modules are
loaded. This is done by renaming the `secret_token.rb` initializer to
`01_secret_token.rb`, which is a bit ugly but involves the least impact on
other files.







Adds migration to ensure all remote mirror columns get created
2018-05-29T10:29:29+00:00

Tiago Botelho
tiagonbotelho@hotmail.com

2018-05-29T09:43:06+00:00

4a344a154949fc9ba72cd6e122fe4e24d952ff3f












Add 'squash and rebase' feature to CE
2018-05-29T09:51:43+00:00

blackst0ne
blackst0ne.ru@gmail.com

2018-05-29T09:51:43+00:00

4cff66a6c46361e8d775ea3f5a80bf147d4020b3