 Valery Sizov
|
7c091d701b
|
Merge branch 'master' into ce_upstream
|
2015-12-03 14:09:00 +02:00 |
|
 Felipe Orlando
|
075e3661c5
|
Update autocomplete_controller to be more readable
|
2015-11-22 06:04:20 -02:00 |
|
 Douwe Maan
|
eaef646651
|
Reduce method complexity in AutocompleteController
|
2015-11-20 13:49:32 +01:00 |
|
|
Douwe Maan
|
5a4c56c38d
|
Reduce method complexity in AutocompleteController
|
2015-11-20 13:49:24 +01:00 |
|
|
Douwe Maan
|
31b1ffd55c
|
Allow mirror user to be set.
|
2015-11-17 12:17:27 +01:00 |
|
 Dmitriy Zaporozhets
|
1ba393de81
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
|
2015-09-16 10:26:10 +02:00 |
|
 Allister Antosik
|
c9389d0e74
|
Sorted autocomplete users list by name
|
2015-09-15 22:48:24 +01:00 |
|
|
Dmitriy Zaporozhets
|
243bf65124
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-08-26 17:15:12 +02:00 |
|
 Stan Hu
|
3715a0f29b
|
Fix bug preventing invite by e-mail
This was broken in 70f5291808 as a result of introducing the ability to filter by current user.
Closes #2320
|
2015-08-21 13:47:56 -07:00 |
|
|
Dmitriy Zaporozhets
|
0fd7d3ebe0
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-08-10 16:01:53 +02:00 |
|
|
Stan Hu
|
70f5291808
|
Always add current user to autocomplete controller to support filter by "Me"
Partial fix #2202
|
2015-08-06 00:46:14 -07:00 |
|
|
Dmitriy Zaporozhets
|
c84b14d2a1
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/autocomplete_controller.rb
app/controllers/omniauth_callbacks_controller.rb
app/controllers/projects/services_controller.rb
app/helpers/projects_helper.rb
app/services/audit_event_service.rb
db/schema.rb
doc/api/users.md
doc/update/6.x-or-7.x-to-7.13.md
features/project/project.feature
|
2015-07-14 15:40:46 +02:00 |
|
|
Stan Hu
|
96644c1fc1
|
Better handle unknown projects and groups for autocomplete
|
2015-07-11 06:19:32 -07:00 |
|
|
Stan Hu
|
0b67d7a0fe
|
Fix user autocomplete for unauthenticated users accessing public projects
Closes #1955
|
2015-07-10 17:39:58 -07:00 |
|
|
Dmitriy Zaporozhets
|
9311f86291
|
Merge branch 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/assets/javascripts/api.js.coffee
app/assets/javascripts/users_select.js.coffee
|
2015-04-14 13:05:39 +03:00 |
|
|
Dmitriy Zaporozhets
|
26053c8705
|
Add autocomplete controller
|
2015-03-26 19:06:19 -07:00 |
|