summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-144-3/+376
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Merge branch 'update_mail_docs' into 'master' Drew Blessing2016-01-142-3/+15
| |\ | | | | | | | | | | | | | | | | | | | | | Update mailroom/postfix documentation [ci skip] I worked with a customer to troubleshoot some strange Postfix and Mailroom issues. These doc updates aim to help other users avoid the same confusion. See merge request !2430
| | * Update mailroom/postfix documentation [ci skip]Drew Blessing2016-01-142-3/+15
| | |
| * | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-144-6/+137
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Modify builds API documentation style [ci skip]Tomasz Maczukin2016-01-131-16/+66
| | |
| * | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1312-11/+415
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | Add some fixes after reviewTomasz Maczukin2016-01-131-36/+0
| | | |
| * | | Fix doc/api/builds.mdTomasz Maczukin2016-01-121-41/+19
| | | |
| * | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1145-125/+499
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (143 commits) Only load autocomplete data when actually needed Check for current user Add pencil icon to edit group settings Issue #5817 wording of the web hooks updated on issue and merge events use JavaScript instead of CoffeeScript in Views, the reason #9819 Before project save ensure that a runners_token exists Fix Error 500 when visiting build page of project with nil runners_token Remove outdated gitlab-git-http-server reference from Install doc Fix typo in build page of projects Update docs for shared runner default settings Disable "Already Blocked" button in admin abuse report page Add CHANGELOG entry for reply-by-email fix Use WOFF versions of SourceSansPro Clean up document on adding users to a project Refactor ZenMode Fix caching issue where build status was not updating in project dashboard Add a CHANGELOG entry for The Most Important Feature of All Time(TM) changes verb `references` to noun `reference`. fixes new branch button positioning, when visible and not visible container DRY up upload and download services ...
| * | | | Update ./doc/api/builds.mdTomasz Maczukin2016-01-111-69/+232
| | | | |
| * | | | Modify builds scope filtering in builds APITomasz Maczukin2016-01-081-3/+2
| | | | |
| * | | | Update ./doc/api/Tomasz Maczukin2016-01-052-0/+207
| | | | |
* | | | | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-142-0/+129
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | Merge branch 'master' into ci/api-variablesDouwe Maan2016-01-142-6/+8
| |\ \ \ \
| * \ \ \ \ 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 ...
| * | | | | Add some cosmetic changes to variables API documentation [ci skip]Tomasz Maczukin2016-01-131-44/+22
| | | | | |
| * | | | | Modify builds API documentation style [ci skip]Tomasz Maczukin2016-01-131-20/+64
| | | | | |
| * | | | | Add 'Build' prefix to Variables entry name in API docs indexTomasz Maczukin2016-01-132-2/+2
| | | | | |
| * | | | | Update ./doc/apiTomasz Maczukin2016-01-072-0/+107
| | | | | |
* | | | | | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-142-6/+8
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | 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
| | |_|/ / / | |/| | | |
* | | | | | Add mofications to triggers API documentation [ci skip]Tomasz Maczukin2016-01-141-32/+12
| | | | | |
* | | | | | Merge branch '8-4-stable' into ci/api-triggersTomasz Maczukin2016-01-1457-144/+1019
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | 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]
View Lorry Controller Status