summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into ci/api-variablesDouwe Maan2016-01-142-6/+8
|\
| * Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-141-2/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Prevent ldap_blocked users from being blocked/unblocked by the APIGabriel Mazetto2016-01-081-2/+4
| | |
| * | Update to Go 1.5.3Stan Hu2016-01-131-4/+4
| | |
* | | Merge branch '8-4-stable' into ci/api-variablesTomasz Maczukin2016-01-1357-145/+1020
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | Merge branch 'doc_styleguide' into 'master' Achilleas Pipinellis2016-01-132-0/+233
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move doc_styleguide in the development directory Reference #3841 And also add many new styleguides: - Naming - Images - Links - Headings - Formatting - Notes - API See merge request !2386
| | * | Update doc_styleguide.md [ci skip]Achilleas Pipinellis2016-01-131-24/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix some syntax/grammar typos - Link to GFM documentation on newlines - Be less strict on the alphabetical order styleguide - You can override the "numbers in headings" rule if you discuss it first - Do not mention CE in notes if the feature is in both CE and EE
| | * | Clarify the naming guidelinedoc_styleguideAchilleas Pipinellis2016-01-121-1/+4
| | | | | | | | | | | | | | | | [ci skip]
| | * | Move doc_styleguide in the development directoryAchilleas Pipinellis2016-01-122-0/+226
| | | | | | | | | | | | | | | | [ci skip]
| * | | Merge branch 'ci/api-projects' into 'master' Douwe Maan2016-01-131-3/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend projects API with CI data Reference #4264 See merge request !2303
| | * | | Modify CI features in projects APIci/api-projectsTomasz Maczukin2016-01-111-20/+1
| | | | |
| | * | | Update ./doc/apiTomasz Maczukin2016-01-071-3/+33
| | | | |
| * | | | Merge branch 'add_username_to_user_system_hooks' of ↵Dmitriy Zaporozhets2016-01-131-0/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/tbeadle/gitlabhq Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Include user_username in user_(add_to/remove_from)_(project/group) system hooks.Tommy Beadle2016-01-071-0/+4
| | | | | |
| | * | | | Include the username in user_create/destroy system hooks.Tommy Beadle2016-01-071-0/+2
| | | | | |
| * | | | | Prepare Installation and Update docs for 8.4 RC1Robert Speicher2016-01-122-2/+150
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Merge branch 'gitlab-omnibus-really' into 'master' Robert Speicher2016-01-122-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Never heard of gitlab-omnibus See merge request !2388
| | * | | | | Never heard of gitlab-omnibusgitlab-omnibus-reallyJacob Vosmaer2016-01-122-3/+3
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'gitlab-workhorse-0.5.4' into 'master' Jacob Vosmaer2016-01-122-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 0.5.4 Fixes routing errors for /api/v3/projects/ See merge request !2391
| | * | | | | Use gitlab-workhorse 0.5.4gitlab-workhorse-0.5.4Jacob Vosmaer2016-01-122-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | Fixes routing errors for /api/v3/projects/
| * | | | | Merge branch 'add_make' into 'master' Achilleas Pipinellis2016-01-121-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | added make command to docs The gitlab-workhose update docs are missing a make command See merge request !2281
| | * | | | added make command to docsChristian Mehlmauer2016-01-041-0/+1
| | | | | |
| * | | | | Merge branch 'typo-fix' into 'master' Robert Schilling2016-01-121-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Fixed minor typo in docker documentation This change is self-explanatory. See merge request !2374
| | * | | | | [ci skip] Fixed minor typo in docker documentationJohn Galt2016-01-111-1/+1
| | | | | | |
| * | | | | | Merge branch 'gitlab-workhorse-0.5.3' into 'master' Robert Speicher2016-01-112-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 0.5.3 See merge request !2367
| | * | | | | | Use gitlab-workhorse 0.5.3gitlab-workhorse-0.5.3Jacob Vosmaer2016-01-112-2/+2
| | |/ / / / /
| * | | | | | Optimize LDAP and add a search timeoutDrew Blessing2016-01-111-0/+5
| |/ / / / /
| * | | | | Merge branch 'doc-update' into 'master' Achilleas Pipinellis2016-01-111-2/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs for shared runner default settings GitLab 8.2 updated shared runners to default to `ENABLED` on all projects. Fixes #5993 See merge request !2358
| | * | | | | Update docs for shared runner default settingsLuke Waite2016-01-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5993
| * | | | | | Remove outdated gitlab-git-http-server reference from Install docRobert Speicher2016-01-101-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Clean up document on adding users to a projectAchilleas Pipinellis2016-01-0914-13/+77
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Merge branch 'api-project-upload' into 'master' Robert Speicher2016-01-081-0/+28
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API project upload endpoint Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317 See merge request !2329
| | * | | | Add API project upload endpointDouwe Maan2016-01-071-0/+28
| | | | | |
| * | | | | Merge branch 'docs_project_services' into 'master' Achilleas Pipinellis2016-01-0818-91/+179
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project services and JIRA documentation clean up Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/176 This was first aiming to fix the JIRA references to EE, but as I was going through it, I decided to revamp more. @Haydn once merged here and then Valery merges CE into EE it should be fixed in doc.gitlab.com as well. @dblessing the docs state that we support JIRA 6.x. I see that 7.x is out, should the docs be amended? Also we seem to have a place to document services (http://doc.gitlab.com/ce/project_services/project_services.html), but the JIRA doc is under integration :/ I'd like it to have it moved under `project_services/`, but I guess most customers know the current URL better. See merge request !2345
| | * | | | | Add JIRA 7 to the supported versionsdocs_project_servicesAchilleas Pipinellis2016-01-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | Clean up the JIRA integration document [ci skip]Achilleas Pipinellis2016-01-089-52/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - new images where needed - move images to a separate img directory - use table for the service fields - link to new documents
| | * | | | | Split external issue tracker documentAchilleas Pipinellis2016-01-088-32/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | Clean up integration READMEAchilleas Pipinellis2016-01-081-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Merge branch 'api-delete-tag' into 'master' Dmitriy Zaporozhets2016-01-081-0/+20
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete tag via API ### What does this MR do? Implements deleting a tag via the API. ### Are there points in the code the reviewer needs to double check? On success, it returns the name of the deleted tag. This is similar to the [delete branch API](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/api/branches.rb#L111). ### What are the relevant issue numbers / Feature requests? * This MR closes #1575 * Closes http://feedback.gitlab.com/forums/176466-general/suggestions/6599203-delete-tags-through-the-api @stanhu Could you do a review? See merge request !1862
| | * | | | | Delete tag via APIapi-delete-tagRobert Schilling2016-01-081-0/+20
| | |/ / / /
| * | | | | Merge branch 'docs_project_services' into 'master' Achilleas Pipinellis2016-01-081-16/+26
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update project services to include all supported ones Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/80 See merge request !2297
| | * | | | Update project services to include all supported onesAchilleas Pipinellis2016-01-051-16/+26
| | | |_|/ | | |/| | | | | | | | | | | | [ci skip]
| * | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-071-0/+0
| | | | |
| * | | | Merge branch 'doc_enable_disable_ci' into 'master' Achilleas Pipinellis2016-01-074-0/+72
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Add documentation on enabling/disabling GitLab CI Closes #4289 See merge request !2320
| | * | | Fix hyphenation typos [ci skip]Achilleas Pipinellis2016-01-071-7/+7
| | | | |
| | * | | Add documentation on enabling/disabling GitLab CIdoc_enable_disable_ciAchilleas Pipinellis2016-01-064-0/+72
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Enable Microsoft Azure OAuth2 supportJanis Meybohm2016-01-062-0/+84
| | | | |
| * | | | Merge branch 'import-gh-pull-requests' into 'master' Douwe Maan2016-01-061-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import GitHub Pull Requests into GitLab Fixes #2833 See merge request !2168
| | * | | | Update doc for importing existing GitHub projects to GitLabimport-gh-pull-requestsDouglas Barbosa Alexandre2016-01-051-2/+2
| | |/ / /
| * | | | Merge branch 'feature/detailed-user-endpoint' of ↵Dmitriy Zaporozhets2016-01-061-0/+7
| |\ \ \ \ | | |/ / / | |/| | | | | | | | https://gitlab.com/Michi302/gitlab-ce
View Lorry Controller Status