delta/gitlab/gitlab-ce.git/Gemfile.lock, branch api-notes-entity-fields gitlab.com: gitlab-org/gitlab-ce.git Merge branch '1363-redo-mailroom-support' into 'master' 2017-02-21T20:36:04+00:00 Douwe Maan douwe@gitlab.com 2017-02-21T20:36:04+00:00 deb62183edbd9111691f62a4f6a9febb1fcd79f7 Redo internals of Incoming Mail Support See merge request !9385 

Redo internals of Incoming Mail Support

See merge request !9385
 Upgrade Rails to 4.2.8 2017-02-21T17:01:53+00:00 Z.J. van de Weg git@zjvandeweg.nl 2017-02-21T17:01:53+00:00 2707cfc1e0734478a9ef6c56912315cfb69dbb7a 






Added support for Authentiq Back-Channel Logout
2017-02-20T16:46:58+00:00

Alexandros Keramidas
dev.alexkeramidas@gmail.com

2017-01-06T19:07:27+00:00

beb887748e8aa3bc42376656f28b689aad91dab7












Use newer mail_room to get `require_relative` support
2017-02-20T16:38:21+00:00

Gabriel Mazetto
brodock@gmail.com

2017-02-20T16:37:50+00:00

e49d55e96116deebcd757c5d833b679918a38127












Add omniauth-oauth2-generic strategy
2017-02-13T18:54:57+00:00

Joe Marty
jmarty@iexposure.com

2017-02-07T20:43:08+00:00

93d4234efa43dea4165a8b0b87c51eb7d6131f28

- Allows configurable Single Sign On with most simple OAuth2 providers
- Adds documentation for the new strategy

Closes #26744





- Allows configurable Single Sign On with most simple OAuth2 providers
- Adds documentation for the new strategy

Closes #26744







Update the rspec_profiling gem to 0.0.5
2017-02-09T12:19:19+00:00

Rémy Coutable
remy@rymai.me

2017-02-09T12:18:26+00:00

8d570583c9aa8bf7e58fe4f8cd96a0e35f6df40b

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>







Merge branch 'master' into 'jej-pages-to-ce'
2017-02-06T15:12:27+00:00

James Edwards-Jones
jamedjo@gmail.com

2017-02-06T15:12:27+00:00

b988faaf85c8e68d501f242b980e5e79a00e2b15

# Conflicts:
#   db/schema.rb




# Conflicts:
#   db/schema.rb






Merge branch 'master' into go-go-gadget-webpack
2017-02-03T19:17:03+00:00

Mike Greiling
mike@pixelcog.com

2017-02-03T19:17:03+00:00

04dc2b76d7e382a6b6369576753cfc20928c99b8

* master: (181 commits)
  Fixed adding to list bug
  Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index
  Fixed modal lists dropdown not updating when list is deleted
  Fixed remove btn error after creating new issue in list
  Removed duplicated test
  Removed Masonry, instead uses groups of data
  Uses mixins for repeated functions
  Fixed up specs
  Props use objects with required & type values
  Removes labels instead of closing issue when clicking remove button
  Fixed JS lint errors
  Fixed issue card spec
  Added webkit CSS properties
  Fixed bug with empty state showing after search Fixed users href path being incorrect
  Fixed bug where 2 un-selected issues would stay on selected tab
  Fixed DB schema Changed how components are added in objects
  Added remove button
  Add optional id property to the issue schema
  Fixed issue link href
  Disabled add issues button if no lists exist
  ...





* master: (181 commits)
  Fixed adding to list bug
  Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index
  Fixed modal lists dropdown not updating when list is deleted
  Fixed remove btn error after creating new issue in list
  Removed duplicated test
  Removed Masonry, instead uses groups of data
  Uses mixins for repeated functions
  Fixed up specs
  Props use objects with required & type values
  Removes labels instead of closing issue when clicking remove button
  Fixed JS lint errors
  Fixed issue card spec
  Added webkit CSS properties
  Fixed bug with empty state showing after search Fixed users href path being incorrect
  Fixed bug where 2 un-selected issues would stay on selected tab
  Fixed DB schema Changed how components are added in objects
  Added remove button
  Add optional id property to the issue schema
  Fixed issue link href
  Disabled add issues button if no lists exist
  ...







Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master'

2017-02-03T18:02:19+00:00

Jacob Schatz
jschatz@gitlab.com

2017-02-03T18:02:19+00:00

538a6875d3b53f909e9b5b6ef396a457cbcae760


Remove Turbolinks

Closes #25624

See merge request !8570





Remove Turbolinks

Closes #25624

See merge request !8570






Merge branch 'master' into jej-pages-picked-from-ee
2017-02-03T17:25:26+00:00

James Edwards-Jones
jedwardsjones@gitlab.com

2017-02-03T17:25:26+00:00

1af3f3b673be8f85b37d455b101954e62c2a3add