Commit Graph
478 Commits
Author SHA1 Message Date
Achilleas Pipinellis dec2151718 Merge branch 'patch-1' into 'master'
Fixed typo for PRIVATE-TOKEN header

Was PRIVATE_TOKEN but should be PRIVATE-TOKEN.
Underscore vs. kebab-case.

See merge request !2624
2016-01-29 18:02:48 +00:00
Dmitriy Zaporozhets dfb8803c1c Improve consistency and duplication for Merge Request API
* Follow REST for merge request API route
* Remove repeating comments API for MR

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-28 14:26:12 +01:00
Markus Fisch a8fc4a01e2 Fixed typo for PRIVATE-TOKEN header
Was PRIVATE_TOKEN but should be PRIVATE-TOKEN.
Underscore vs. kebab-case.
2016-01-27 12:16:37 +00:00
Achilleas Pipinellis 97b2d78de8 Merge branch 'doc_refactor_system_hooks_api' into 'master'
Refactor system_hooks API documentation



See merge request !2475
2016-01-24 19:24:46 +00:00
Achilleas Pipinellis df4d676811 Merge branch 'doc_refactor_namespaces_api' into 'master'
Refactor namespaces API documentation



See merge request !2472
2016-01-24 19:23:56 +00:00
Achilleas Pipinellis 28c14ceaa2 Merge branch 'doc_refactor_README_api' into 'master'
Refactor README API documentation

~~Waiting for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2435 to be merged.~~

See merge request !2476
2016-01-24 19:22:42 +00:00
Achilleas Pipinellis 23a878c40c Clean up system hooks API documentation
[ci skip]
2016-01-24 20:20:39 +01:00
Achilleas Pipinellis 4ae7cb9a93 Merge branch 'doc_refactor_settings_api' into 'master'
Refactor settings API documentation



See merge request !2474
2016-01-24 18:36:51 +00:00
Achilleas Pipinellis 2b3e64a601 Clean up namespaces API documentation
[ci skip]
2016-01-24 19:28:24 +01:00
Achilleas Pipinellis 6cab2e4076 Merge branch 'doc_refactor_labels_api' into 'master'
Refactor labels API documentation



See merge request !2471
2016-01-24 16:53:46 +00:00
Achilleas Pipinellis ebaedca907 Merge branch 'doc_refactor_issues_api' into 'master'
Refactor issues API documentation



See merge request !2466
2016-01-24 16:40:50 +00:00
Achilleas Pipinellis 9f095bbbcc Merge branch 'doc_refactor_deploy_keys_api' into 'master'
Refactor deploy_keys API documentation



See merge request !2467
2016-01-24 16:39:39 +00:00
Achilleas Pipinellis 82e352d0b4 Merge branch 'doc_refactor_branches_api' into 'master'
Refactor branches API documentation



See merge request !2464
2016-01-24 16:38:43 +00:00
Achilleas Pipinellis 373b277f03 Add note about commit status API deprecation
[ci skip]
2016-01-22 10:08:57 +01:00
Achilleas Pipinellis 831eb9468d Merge branch 'master' into doc_refactor_commits_api 2016-01-22 09:34:45 +01:00
Josh Frye 11797df1af Change 'public' flag to more robust 'visibility' query. 2016-01-19 09:57:00 -05:00
Josh Frye 6951396dbe Update all docs for public param 2016-01-19 09:57:00 -05:00
Josh Frye 10669097fa Add public params to GET /projects api. Closes #3788 2016-01-19 09:57:00 -05:00
Achilleas Pipinellis b4d61ac46b Merge branch 'master' into doc_refactor_commits_api 2016-01-19 11:18:57 +01:00
Achilleas Pipinellis 1ede975cde Styleguide the commit status API
[ci skip]
2016-01-19 11:18:17 +01:00
Achilleas Pipinellis 84354b4bd2 Fix typos, grammar and other styleguide issues
[ci skip]
2016-01-18 21:49:04 +01:00
Achilleas Pipinellis 2ffc438efb Use plaintext instead of json in code blocks
[ci skip]
2016-01-18 11:45:04 +01:00
Achilleas Pipinellis 958dd27777 Clean-up API README [ci skip]
- Fix some curl examples
- Fix examples for id vs iid
2016-01-18 11:38:54 +01:00
Achilleas Pipinellis 415b78e07c Merge branch 'master' into doc_refactor_README_api 2016-01-18 11:04:39 +01:00
Achilleas Pipinellis 23b4d31def Merge branch 'rc-document-new-api-pagination-headers' into 'master'
Document new API pagination headers

Document new API pagination headers introduced in !2426. Solves #8098.

/cc @dzaporozhets @dblessing

See merge request !2435
2016-01-18 10:00:50 +00:00
Achilleas Pipinellis 4a76f9217a Clean up pagination documentation [ci skip]
- Fix heading names
- Fix curl example
- Use full request output
- Use table for the extra headers
2016-01-18 10:55:25 +01:00
Achilleas Pipinellis 60752b6ec8 Refactor README API documentation [ci skip] 2016-01-18 10:10:33 +01:00
Achilleas Pipinellis 9eeda3da3d Remove relative link
It wouldn't work on doc.gitlab.com

[ci skip]
2016-01-18 09:48:19 +01:00
Achilleas Pipinellis 3db8cfefc7 Refactor system_hooks API documentation [ci skip] 2016-01-18 09:45:50 +01:00
Achilleas Pipinellis 585e7f6e35 Refactor settings API documentation [ci skip] 2016-01-18 09:44:19 +01:00
Achilleas Pipinellis ddc8b91a5f Refactor namespaces API documentation [ci skip] 2016-01-18 09:42:44 +01:00
Achilleas Pipinellis 981a6865f2 Refactor labels API documentation [ci skip] 2016-01-18 09:41:42 +01:00
Achilleas Pipinellis cfb0628d76 Refactor deploy_keys API documentation [ci skip] 2016-01-18 09:16:14 +01:00
Achilleas Pipinellis 13f52de0fa Refactor issues API documentation
[ci skip]
2016-01-18 09:11:01 +01:00
Achilleas Pipinellis c870bb796b Refactor commits API documentation
[ci skip]
2016-01-18 08:25:38 +01:00
Achilleas Pipinellis 68755a2397 Refactor branches API documentation
[ci skip]
2016-01-18 08:21:01 +01:00
Tomasz Maczukin 768721dc58 Merge branch 'master' into ci/api-triggers
* master: (150 commits)
  fixes margin and padding
  Update mailroom/postfix documentation [ci skip]
  Fix css mess around git clone panel. Align it properly
  Fix missing padding for user/group pages
  Fix parse_gollum_tags matcher
  Update documentation on Banzai::Filter::GollumTagsFilter
  Add tests for the wiki pipeline
  Refactoring Banzai::Filter::GollumTagsFilter
  Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter
  Remove GollumTagsPipeline
  Refactoring Gitlab::GithubImport::Importer
  Remove unnecessary brackets on WIKI_SLUG_ID route constraints
  Move js function to removing accents to vendor/assets/javascripts
  Update CHANGELOG
  Use the WikiPipeline when rendering the wiki markdown content
  Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML
  Relax constraints for wiki slug
  Import GitHub wiki into GitLab
  Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus
  Revert changes to how the notes are paginated in the API
  ...

Conflicts:
	doc/api/README.md
	lib/api/entities.rb
2016-01-14 21:58:17 +01:00
Rémy Coutable 8026d420c9 Document new API pagination headers 2016-01-14 17:14:20 +01:00
Tomasz Maczukin 405b82af23 Merge branch 'master' into ci/api-builds
* master: (51 commits)
  Fix version
  Fix specs and rubocop warnings
  Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages
  fixed LDAP activation on login to use new ldap_blocked state
  Fix Admin/Users view to position buttons without spacing magic
  Update to Go 1.5.3
  Fix the undefinded variable error in Project's safe_import_url method
  Update CHANGELOG [ci skip]
  Add some cosmetic changes to variables API documentation [ci skip]
  Fix misaligned edit button in milestone collection partial
  Update button styles for Milestones#show
  Modify builds API documentation style [ci skip]
  Modify :ci_variable factory
  Ensure the API doesn't return notes that the current user shouldn't see
  Add 'Build' prefix to Variables entry name in API docs index
  Fix some typos
  Add spec for Note#cross_reference_not_visible_for?
  Remove (invalid) timestamp formatting
  Move `BroadcastMessage#status` to a helper since it's presentational
  Update CHANGELOG
  ...

Conflicts:
	doc/api/README.md
	lib/api/api.rb
	lib/api/entities.rb
2016-01-14 13:30:18 +01:00
Tomasz Maczukin af3b97cdde Merge branch 'master' into ci/api-triggers
* master:
  Fix version
  Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages
  Update CHANGELOG [ci skip]
  Add some cosmetic changes to variables API documentation [ci skip]
  Modify builds API documentation style [ci skip]
  Modify :ci_variable factory
  Add 'Build' prefix to Variables entry name in API docs index
  Fix some typos
  Add some fixes after review
  Remove blank line
  Update ./doc/api
  Change :variable_id to :key as resource ID in API
  Fix a typo in method description
  Add create feature to variables API
  Add missing 'not_found' checks in variables API
  Add delete feature to variables API
  Add update feature for variables API
  Add features for list and show details of variables in API

Conflicts:
	doc/api/README.md
	lib/api/entities.rb
2016-01-14 13:09:54 +01:00
Tomasz Maczukin 8eed187677 Merge branch 'master' into ci/api-triggers
* master: (32 commits)
  Fix specs and rubocop warnings
  fixed LDAP activation on login to use new ldap_blocked state
  Fix Admin/Users view to position buttons without spacing magic
  Update to Go 1.5.3
  Fix the undefinded variable error in Project's safe_import_url method
  Fix misaligned edit button in milestone collection partial
  Update button styles for Milestones#show
  Ensure the API doesn't return notes that the current user shouldn't see
  Add spec for Note#cross_reference_not_visible_for?
  Remove (invalid) timestamp formatting
  Move `BroadcastMessage#status` to a helper since it's presentational
  Update CHANGELOG
  Broadcast Messages can now be edited
  Update Broadcast Message features
  Update BroadcastMessage model
  Update broadcast_message helper
  Simplify BroadcastMessage factory
  Simplify broadcast message JS
  Remove alert_type attribute from BroadcastMessage
  Move broadcast message form to a partial
  ...
2016-01-14 12:24:20 +01:00
Douwe Maan 0014f19327 Merge branch 'master' into ci/api-variables 2016-01-14 12:04:28 +01:00
Douwe Maan 4d64a32c88 Merge branch 'feature/ldap-sync-edgecases' into 'master'
LDAP Sync blocked user edgecases

Allow GitLab admins to block otherwise valid GitLab LDAP users
(https://gitlab.com/gitlab-org/gitlab-ce/issues/3462)

Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other.

Expected behavior:

- [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?`
- [x] "ldap_blocked" users can't be unblocked by the Admin UI
- [x] "ldap_blocked" users can't be unblocked by the API
- [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked"
- [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization
- [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked`
 
Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users:
![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png)

There will be another MR for the EE version.

See merge request !2242
2016-01-14 11:00:08 +00:00
Tomasz Maczukin c5b429f099 Add mofications to triggers API documentation [ci skip] 2016-01-14 11:08:45 +01:00
Tomasz Maczukin 57a67c4fdb Merge branch '8-4-stable' into ci/api-triggers
* 8-4-stable: (280 commits)
  Add Changelog entry for build traces data integrity fix
  Update doc_styleguide.md [ci skip]
  Added hint that you can search users by name, username, or email.
  Add changelog
  Version 8.4.0.rc1
  Randomize metrics sample intervals
  Make the metrics sampler interval configurable
  Don't automatically require awesome_print
  Disable colorization if STDOUT is not a tty
  Block the reported user before destroying the record
  changes `$quote-gray` to `$secondary-text`
  makes message plural for multiple MRs and removes from loop. Duh.
  Prepare Installation and Update docs for 8.4 RC1
  Mention channel/key bug in irkerd docs
  Revert "Remove the `:coffee` and `:coffeescript` Haml filters"
  gets merge request discussion working again
  adds back in discussion.haml.html for issues commenting and closing/reopening properly.
  removing last chunk of MR ajax changes, rest will be in another MR
  reverting more MR ajax files, will appear in different commit
  reverting MR ajax changes, which will be in a different MR
  ...
2016-01-14 10:58:40 +01:00
Tomasz Maczukin 633ac13404 Modify triggers API documentation style [ci skip] 2016-01-14 10:57:56 +01:00
Tomasz Maczukin 220c3a44c9 Merge branch '8-4-stable' into ci/api-variables
* 8-4-stable: (285 commits)
  Add Changelog entry for build traces data integrity fix
  Update doc_styleguide.md [ci skip]
  Added hint that you can search users by name, username, or email.
  Add changelog
  Version 8.4.0.rc1
  Randomize metrics sample intervals
  Make the metrics sampler interval configurable
  Don't automatically require awesome_print
  Disable colorization if STDOUT is not a tty
  Block the reported user before destroying the record
  changes `$quote-gray` to `$secondary-text`
  makes message plural for multiple MRs and removes from loop. Duh.
  Prepare Installation and Update docs for 8.4 RC1
  Mention channel/key bug in irkerd docs
  Revert "Remove the `:coffee` and `:coffeescript` Haml filters"
  gets merge request discussion working again
  adds back in discussion.haml.html for issues commenting and closing/reopening properly.
  removing last chunk of MR ajax changes, rest will be in another MR
  reverting more MR ajax files, will appear in different commit
  reverting MR ajax changes, which will be in a different MR
  ...
2016-01-13 23:59:00 +01:00
Tomasz Maczukin f11ba743a5 Add some cosmetic changes to variables API documentation [ci skip] 2016-01-13 23:16:10 +01:00
Tomasz Maczukin 4cdbb2f628 Modify builds API documentation style [ci skip] 2016-01-13 21:19:18 +01:00
Tomasz Maczukin c9a1661979 Merge branch 'master' into ci/api-builds
* master: (76 commits)
  Add Changelog entry for build traces data integrity fix
  Update doc_styleguide.md [ci skip]
  Added hint that you can search users by name, username, or email.
  Add changelog
  Randomize metrics sample intervals
  Make the metrics sampler interval configurable
  Don't automatically require awesome_print
  Disable colorization if STDOUT is not a tty
  Block the reported user before destroying the record
  changes `$quote-gray` to `$secondary-text`
  makes message plural for multiple MRs and removes from loop. Duh.
  Prepare Installation and Update docs for 8.4 RC1
  Mention channel/key bug in irkerd docs
  Revert "Remove the `:coffee` and `:coffeescript` Haml filters"
  gets merge request discussion working again
  adds back in discussion.haml.html for issues commenting and closing/reopening properly.
  removing last chunk of MR ajax changes, rest will be in another MR
  reverting more MR ajax files, will appear in different commit
  reverting MR ajax changes, which will be in a different MR
  reverting _mr_title.html.haml
  ...
2016-01-13 20:53:42 +01:00