 Dmitriy Zaporozhets
|
935fc796d1
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
VERSION
app/controllers/admin/application_settings_controller.rb
app/controllers/omniauth_callbacks_controller.rb
app/controllers/projects/project_members_controller.rb
app/helpers/application_settings_helper.rb
app/models/user.rb
app/services/files/base_service.rb
app/views/profiles/accounts/show.html.haml
db/schema.rb
doc/install/installation.md
doc/update/6.x-or-7.x-to-7.11.md
doc/workflow/README.md
lib/gitlab/markdown/external_issue_reference_filter.rb
lib/gitlab/reference_extractor.rb
lib/gitlab/upgrader.rb
|
2015-06-05 11:40:36 +02:00 |
|
 Robert Speicher
|
6e5473f930
|
Remove show actions from Admin and Project DeployKeys
|
2015-06-03 18:03:04 -04:00 |
|
|
Dmitriy Zaporozhets
|
f502b293e5
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
db/schema.rb
spec/helpers/gitlab_markdown_helper_spec.rb
|
2015-04-24 11:22:54 +03:00 |
|
 Jeroen van Baarsen
|
5a4ebfb47a
|
Fixed the Rails/ActionFilter cop
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
2015-04-20 15:39:37 +02:00 |
|
|
Dmitriy Zaporozhets
|
1a22f0a2b1
|
Fix audit logging for project deploy keys
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-04-16 13:58:07 +03:00 |
|
|
Dmitriy Zaporozhets
|
d01d0c02b7
|
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/admin/application_settings_controller.rb
app/controllers/groups/group_members_controller.rb
app/controllers/projects/deploy_keys_controller.rb
app/controllers/projects/project_members_controller.rb
app/models/concerns/mentionable.rb
app/models/project.rb
app/models/project_team.rb
app/models/service.rb
app/views/admin/application_settings/_form.html.haml
app/views/admin/groups/show.html.haml
app/views/groups/group_members/_new_group_member.html.haml
config/initializers/1_settings.rb
db/schema.rb
lib/gitlab/reference_extractor.rb
spec/lib/gitlab/reference_extractor_spec.rb
|
2015-04-15 19:22:57 +03:00 |
|
 Douwe Maan
|
ed097df627
|
Clean up code.
|
2015-04-03 12:28:47 +02:00 |
|
|
Douwe Maan
|
edc4a56d26
|
Allow admin to create public deploy keys that are accessible to any project.
|
2015-04-03 12:23:20 +02:00 |
|
 Valery Sizov
|
08586a6169
|
Audit log for deploy keys
|
2015-03-23 19:11:39 +02:00 |
|
|
Douwe Maan
|
7d2b34bd61
|
Satisfy Rubocop.
|
2015-03-17 16:00:32 +01:00 |
|
|
Douwe Maan
|
9c7fffb655
|
Delete deploy key when last connection to a project is destroyed.
|
2015-03-17 14:55:43 +01:00 |
|
 Vinnie Okada
|
76aad9b76e
|
Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:
* Use nested resources to avoid slashes in arguments to path helpers.
|
2015-02-14 11:09:23 -07:00 |
|
 Ciro Santilli
|
9e1b97ad99
|
Use @project on controllers, don't call method
Also memoize the method to ensure that other methods in
ApplicationController that rely on it can call it efficiently.
|
2014-10-19 23:36:23 +02:00 |
|
|
Dmitriy Zaporozhets
|
8fee5a0572
|
Make app works with strong params
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-06-26 23:24:17 +03:00 |
|
 skv
|
d89527839e
|
fix most of warnings
|
2013-12-15 00:05:10 +04:00 |
|
|
Dmitriy Zaporozhets
|
2ed7cbfba4
|
Move projects controllers/views in Projects module
|
2013-06-23 19:47:22 +03:00 |
|