home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,125 Commits 48 Branches 340 Tags
baebeb487a6778bbbbedf9c6e8cc877fd1d2205d
Commit Graph
689 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 067673fbe7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into master-ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 11:13:30 +02:00
Dmitriy Zaporozhets 72a425fa66 Merge branch 'remove-satellites' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 09:52:39 +02:00
Stan Hu e56fd693ee Merge pull request #9567 from bigsurge/bigsurge-patch-1 
add CommitNote field expose :created_at
 2015-08-19 00:23:17 -07:00
bigsurge cecc18616a add CommitNote field expose :created_at 
add CommitNote field expose :created_at
 2015-08-19 14:29:18 +08:00
Douwe Maan 0f2616b365 Merge branch 'ldap-group-links-api-doc-fix' into 'master' 
Make the `provider` argument for the LDAP group links API endpoint required

Related to #329

If no `provider` is passed to the API endpoint, the group link is not created properly. Making it required fixes the issue temporarily. It should default to the first provider.

Next step, as mentioned in #329, is to do that.

/cc @job

See merge request !475
 2015-08-17 23:24:30 +00:00
Dmitriy Zaporozhets 680b087764 Merge master from CE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 14:01:32 +02:00
Dmitriy Zaporozhets 4a0fa27017 Merge branch 'master' into remove-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 11:41:53 +02:00
Ben Boeckel 95f8f7c729 api: add 'system', 'upvote', and 'downvote' fields to note queries 
This reverts commit 4c586dc7c2.
 2015-08-12 17:02:33 -04:00
Patricio Cano 72412d8478 Made the provider argument a required one, since the feature wasn't working properly if no provider was given. Related to #329 2015-08-11 14:38:13 -05:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 5daf44b7c8 Merge branch 'revert-satellites' into 'master' 
Revert satellites

Return satellites to master for 7.14

We remove satellites in next release (8.0)

See merge request !1136
 2015-08-11 12:27:38 +00:00
Dmitriy Zaporozhets b9b9fe70b8 Revert "Fix editing files via API" 
This reverts commit 7bde6ae540.
 2015-08-11 13:29:35 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02: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 c5648de230 Fix corrupted binary files when using API files endpoint 
Add CHANGELOG for gitlab_git 7.2.9 updates

Closes #2219
 2015-08-09 15:23:22 -07:00
Douwe Maan 8b6ae0104d Merge branch 'master' into comment-updated-by 2015-08-06 12:52:26 +02:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Dmitriy Zaporozhets c17f5d06aa Fix merge api and spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:33:53 +02:00
Douwe MaanandRobert Speicher 8802846565 Fix indentation 2015-07-31 16:39:51 -04:00
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02:00
Douwe Maan 51e5f379dd Merge branch 'master' into api-useremails 2015-07-31 14:34:53 +02:00
Douwe Maan 04f2da3c37 Merge branch 'master' into comment-updated-by 2015-07-31 14:29:23 +02:00
Douwe Maan 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +02:00
Douwe Maan b8066e2cd0 No more web url 2015-07-30 11:56:15 +02:00
Douwe Maan 4fb6ddfe06 Add ability to manage user email addresses via the API. 2015-07-29 15:40:08 +02:00
Douwe Maan a784b996b3 Add project star and fork count, group avatar URL and user/group web URL attributes to API 2015-07-28 15:49:44 +02:00
Douwe Maan f032b15dcf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	README.md
#	app/controllers/projects_controller.rb
#	db/schema.rb
#	doc/workflow/README.md
#	lib/gitlab/satellite/merge_action.rb
 2015-07-23 13:40:31 +02:00
Stan Hu 6c9f527b3f Return comments in created order in merge request API 
Closes #1832
 2015-07-16 22:33:58 -07:00
Dmitriy Zaporozhets a7fded9b95 Huge refactoring for accepting merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 16:03:07 +02:00
Stan Hu daed441dfe Merge branch 'merge-request-wip-information' into 'master' 
api: expose work_in_progress flag

See merge request !948
 2015-07-15 01:13:05 +00: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
Douwe MaanandRobert Speicher b93053695a Fix transferring of project to another group using the API. 2015-07-11 16:47:33 -04:00
Ben Boeckel 414cacd7f4 api: expose work_in_progress flag 2015-07-10 10:33:43 -04:00
Stan Hu 4c586dc7c2 Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries" 
This reverts commit dd4fee5fdb.
 2015-07-09 12:35:53 -07:00
Ben Boeckel dd4fee5fdb api: add 'system', 'upvote', and 'downvote' fields to note queries 2015-07-09 11:24:28 -04:00
Dmitriy Zaporozhets f76092c06d Merge branch 'settings-via-api' into 'master' 
API to set application settings for admin

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

See merge request !934
 2015-07-07 10:57:41 +00:00
Dmitriy Zaporozhets 603ceea21a Add tests and improve logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-06 16:47:19 +02:00
Dmitriy Zaporozhets b28714b6a9 Add docs and empty specs for applicaiton settings API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-06 15:53:08 +02:00
Dmitriy Zaporozhets c2ee6862c8 API to set application settings for admin 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-03 16:50:21 +02:00
Steve Norman b3a751112d Allow user to be blocked and unblocked via the API 2015-07-03 11:17:57 +00:00
Dmitriy Zaporozhets dd32818441 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/assets/javascripts/project_new.js.coffee
	app/helpers/appearances_helper.rb
	app/helpers/application_helper.rb
	app/helpers/groups_helper.rb
	app/helpers/oauth_helper.rb
	app/models/user.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/layouts/nav/_group.html.haml
	app/views/layouts/nav/_project_settings.html.haml
	app/views/profiles/accounts/show.html.haml
	doc/integration/README.md
	features/steps/project/merge_requests.rb
	features/support/env.rb
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/oauth_helper_spec.rb
	spec/lib/gitlab/ldap/access_spec.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/project_team_spec.rb
	spec/routing/admin_routing_spec.rb
	spec/services/git_push_service_spec.rb
	spec/services/test_hook_service_spec.rb
 2015-07-02 17:07:02 +02:00
Dmitriy Zaporozhets 9f166a8649 Merge branch 'rename-abilities' into 'master' 
Rename abilities to correspond contoller/model action names

write_ was renamed to create_
modify_  was renamed to update_

So now in update action we have next code

```
def create
  can?(current_user, :create_issue, @issue)
end

def update
  can?(current_user, :update_issue, @issue)
end
```

See merge request !896
 2015-06-26 16:39:17 +00:00
Dmitriy Zaporozhets 58ceb8e950 Only people who can manage issue can assign labels to it 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 16:02:57 +02:00
Dmitriy Zaporozhets 342d553709 Rename abilities to correspond contoller/model action names 
write_ was renamed to create_
modify_  was renamed to update_

So now in update action we have next code

def create
  can?(current_user, :create_issue, @issue)
end

def update
  can?(current_user, :update_issue, @issue)
end

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 15:55:56 +02:00
Stan Hu 6548e9b48c Add 2FA status to user admin API 
Closes https://github.com/gitlabhq/gitlabhq/issues/9391
 2015-06-23 22:41:59 -07:00
Stan Hu e80d7a804f Fix error when deleting a user who has projects 
Closes #1856
Closes https://github.com/gitlabhq/gitlabhq/issues/9394
 2015-06-23 04:39:49 -07:00
Douwe Maan d7d3a2885f Merge branch 'feature/ldap_group_link_api' into 'master' 
Add API support for adding and removing LDAP group links

See merge request !4
 2015-06-09 09:27:39 +00:00
Dmitriy Zaporozhets a83d0034e3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/services/files/base_service.rb
	app/services/files/create_service.rb
	app/services/files/delete_service.rb
	app/services/files/update_service.rb
	doc/workflow/README.md
 2015-06-08 18:24:34 +02:00
Dmitriy Zaporozhets 7bde6ae540 Fix editing files via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 17:16:51 +02:00
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