Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Add API docs and correctly expose release api | Dmitriy Zaporozhets | 2015-11-12 | 1 | -0/+31 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Move git tags API to separate file | Dmitriy Zaporozhets | 2015-11-12 | 2 | -74/+75 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | Merge remote-tracking branch 'ce/master' into ce-to-ee | Robert Speicher | 2015-11-15 | 1 | -0/+6 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Expose CI enable option in project features | Kamil Trzcinski | 2015-11-13 | 1 | -0/+6 | |
| |/ / | | | | | | | | | | - Enable CI by default for all new projects | |||||
* | | | Merge remote-tracking branch 'ce/master' into ce-to-ee | Robert Speicher | 2015-11-13 | 1 | -2/+4 | |
|\ \ \ | |/ / | ||||||
| * | | Add allow_failure field to commit status API | Stan Hu | 2015-11-03 | 1 | -2/+4 | |
| | | | | | | | | | | | | Closes #3196 | |||||
* | | | Merge remote-tracking branch 'origin/master' into ce_upsteram | Valery Sizov | 2015-11-05 | 1 | -1/+2 | |
|\ \ \ | |/ / | ||||||
| * | | Add ability to fetch the commit ID of the last commit that actually touched ↵api_file_touched_at | Valery Sizov | 2015-11-02 | 1 | -1/+2 | |
| |/ | | | | | | | a file | |||||
* | | Merge remote-tracking branch 'origin/master' into ce_upstream_15_10 | Valery Sizov | 2015-10-15 | 3 | -1/+91 | |
|\ \ | |/ | ||||||
| * | [ci skip] Add missing parameters in API doc | sue445 | 2015-10-14 | 1 | -0/+2 | |
| | | ||||||
| * | Small bug fixes | Kamil Trzcinski | 2015-10-12 | 1 | -1/+0 | |
| | | ||||||
| * | Add Commit Status documentation | Kamil Trzcinski | 2015-10-12 | 1 | -0/+82 | |
| | | ||||||
| * | Implement Commit Status API | Kamil Trzcinski | 2015-10-12 | 1 | -1/+2 | |
| | | ||||||
| * | api: add enable_ssl_verification to PUT/POST hooks | Ben Boeckel | 2015-09-24 | 1 | -0/+2 | |
| | | ||||||
| * | doc: list note_events as a valid parameter for PUT/POST hooks | Ben Boeckel | 2015-09-24 | 1 | -0/+2 | |
| | | ||||||
| * | api: expose note_events and enable_ssl_verification for hooks | Ben Boeckel | 2015-09-24 | 1 | -0/+2 | |
| | | ||||||
* | | Abiliy to disable 'Share with Group' feature | Valery Sizov | 2015-10-01 | 1 | -0/+18 | |
| | | ||||||
* | | Add documentation for 'Share project with group' API call | Valery Sizov | 2015-09-30 | 1 | -0/+14 | |
| | | ||||||
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee | Dmitriy Zaporozhets | 2015-09-16 | 3 | -8/+705 | |
|\ \ | |/ | ||||||
| * | Added service API endpoint to retrieve service parameters | Petheo Bence | 2015-09-10 | 1 | -0/+160 | |
| | | ||||||
| * | Move get user by ID of an SSH key documentation to separate file | Artem V. Navrotskiy | 2015-09-03 | 3 | -45/+47 | |
| | | ||||||
| * | Add API method for get user by ID of an SSH key | Artem V. Navrotskiy | 2015-09-03 | 1 | -0/+45 | |
| | | ||||||
| * | Drone CI service | Kirilll Zaitsev | 2015-09-02 | 1 | -8/+498 | |
| | | ||||||
| * | api: add 'system', 'upvote', and 'downvote' fields to note queries | Ben Boeckel | 2015-08-12 | 1 | -2/+8 | |
| | | | | | | | | This reverts commit 4c586dc7c217b3e43956919fa752a8fa4e16acb9. | |||||
* | | Correct grant_type in example | Alex Warren | 2015-08-27 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'ldap-group-links-api-doc-fix' into 'master' | Douwe Maan | 2015-08-17 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | Made the `provider` argument a required one, since the feature wasn't ↵ | Patricio Cano | 2015-08-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | working properly if no provider was given. Related to #329 | |||||
* | | | Merge master from CE | Dmitriy Zaporozhets | 2015-08-17 | 1 | -2/+8 | |
|/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee | Dmitriy Zaporozhets | 2015-08-10 | 1 | -0/+132 | |
|\ \ | |/ | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Fix docs | Douwe Maan | 2015-07-30 | 1 | -6/+6 | |
| | | ||||||
| * | Add ability to manage user email addresses via the API. | Douwe Maan | 2015-07-29 | 1 | -0/+132 | |
| | | ||||||
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee | Douwe Maan | 2015-07-23 | 1 | -10/+5 | |
|\ \ | |/ | | | | | | | | | | | | | | | # Conflicts: # README.md # app/controllers/projects_controller.rb # db/schema.rb # doc/workflow/README.md # lib/gitlab/satellite/merge_action.rb | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2015-07-16 | 1 | -2/+5 | |
| |\ | ||||||
| | * | api: expose work_in_progress flag | Ben Boeckel | 2015-07-10 | 1 | -2/+5 | |
| | | | ||||||
| * | | Remove author information from "post" in merge_requests API. | Robin Burchell | 2015-07-13 | 1 | -8/+0 | |
| | | | | | | | | | | | | | | | From both experimenting with the API and reading the source code, this appears to not be used at all. My guess is this was copypasta from somewhere else. | |||||
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee | Dmitriy Zaporozhets | 2015-07-14 | 4 | -6/+126 | |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | Revert "added link to issue closing pattern in doc" | Sytse Sijbrandij | 2015-07-13 | 1 | -2/+0 | |
| | | | | | | | | | | | | This reverts commit 903daedb5a963d55f8b2e836127958f92a1562a5. | |||||
| * | | added link to issue closing pattern in doc | karen Carias | 2015-07-10 | 1 | -0/+2 | |
| |/ | ||||||
| * | Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries" | Stan Hu | 2015-07-09 | 1 | -8/+2 | |
| | | | | | | | | This reverts commit dd4fee5fdbda07fbc09234c4b043c3c9939a6a9b. | |||||
| * | api: add 'system', 'upvote', and 'downvote' fields to note queries | Ben Boeckel | 2015-07-09 | 1 | -2/+8 | |
| | | ||||||
| * | Make sure webhooks are mentioned at the top level. | Sytse Sijbrandij | 2015-07-08 | 2 | -5/+8 | |
| | | ||||||
| * | Merge branch 'settings-via-api' into 'master' | Dmitriy Zaporozhets | 2015-07-07 | 2 | -0/+89 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | API to set application settings for admin Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !934 | |||||
| | * | Add docs and empty specs for applicaiton settings API | Dmitriy Zaporozhets | 2015-07-06 | 2 | -0/+89 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Allow user to be blocked and unblocked via the API | Steve Norman | 2015-07-03 | 1 | -0/+28 | |
| |/ | ||||||
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Dmitriy Zaporozhets | 2015-07-02 | 1 | -2/+4 | |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | Add 2FA status to user admin API | Stan Hu | 2015-06-23 | 1 | -2/+4 | |
| | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9391 | |||||
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee | Dmitriy Zaporozhets | 2015-06-12 | 1 | -1/+1 | |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/helpers/tab_helper.rb app/models/merge_request.rb app/views/layouts/nav/_project_settings.html.haml app/views/projects/merge_requests/show/_mr_accept.html.haml doc/api/groups.md | |||||
| * | Merge branch 'info_about_namespaces' into 'master' | Job van der Voort | 2015-06-11 | 1 | -178/+192 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Info about namespaces Added info about namespaces in groups. Because of tweet https://twitter.com/kaystrobach/status/603912904757420032 See merge request !1835 | |||||
| | * | added links to API calls | Karen Carias | 2015-06-10 | 1 | -191/+191 | |
| | | | ||||||
| | * | fixed namespaces info | Karen Carias | 2015-05-28 | 1 | -3/+3 | |
| | | |