summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* API: Version informationapi-versionRobert Schilling2016-10-122-0/+24
|
* Merge branch 'user-events-api' into 'master' Robert Speicher2016-10-122-1/+147
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: New /users/:id/events endpoint ## What does this MR do? If add a new `/users/:id/events` endpoint to retrieve a user's contribution events. The events returned are filtered so that only the events for projects that the current user can see are returned (similarly to what we do at the controller level). ## Why was this MR needed? Because it's a nice feature to calculate leaderboards, for instance for #17815. ## What are the relevant issue numbers? Closes #20866. See merge request !6771
| * Addresses Robert's feedbackRémy Coutable2016-10-112-2/+2
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * API: New /users/:id/events endpointRémy Coutable2016-10-101-0/+146
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'guests_cant_see_mrs' into 'master' Sean McGivern2016-10-111-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make guests unable to view MRs ## What does this MR do? Make guests unable to view MRs. This also fixes a bug when a non-member user could get notification if mentioned (in private project, it's OK for public project). Now if you are a guest and you will be mentioned in one of the MRs you won't get a notification. ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1410 See merge request !6673
| * | Make guests unable to view MRsguests_cant_see_mrsValery Sizov2016-10-111-0/+1
| | |
* | | Merge branch 'docs/refactor-operations' into 'master' Achilleas Pipinellis2016-10-1111-364/+370
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move operations/ to new location ## What does this MR do? Move operations/ to new location. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/3349 ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [ ] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [ ] Make sure internal links pointing to the document in question are not broken. - [ ] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [ ] If working on CE, submit an MR to EE with the changes as well. See merge request !6519
| * | | Move operations/ to new locationdocs/refactor-operationsAchilleas Pipinellis2016-10-1111-364/+370
| | | | | | | | | | | | | | | | [ci skip]
* | | | Move health check docs under user/admin_area/monitoringAchilleas Pipinellis2016-10-114-2/+2
| |/ / |/| | | | | | | | [ci skip]
* | | Merge branch 'docs/add-fake-tokens-examples' into 'master' Achilleas Pipinellis2016-10-111-0/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add examples of fake tokens to be used in docs See merge request !6805
| * | | Add examples of fake tokens to be used in docsAchilleas Pipinellis2016-10-111-0/+23
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'docs/refactor-monitoring' into 'master' Achilleas Pipinellis2016-10-1120-574/+580
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move monitoring/ to new location ## What does this MR do? Move monitoring/ to new location. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/3349 ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [ ] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [ ] Make sure internal links pointing to the document in question are not broken. - [ ] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [ ] If working on CE, submit an MR to EE with the changes as well. See merge request !6518
| * | | | Move monitoring/ to new locationAchilleas Pipinellis2016-09-2520-574/+580
| | |/ / | |/| |
* | | | Merge branch 'docs/refactor-reply-by-email' into 'master' Achilleas Pipinellis2016-10-117-626/+631
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move reply by email docs to a new location ## What does this MR do? Move reply by email docs to a new location. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/3349 ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [ ] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [ ] Make sure internal links pointing to the document in question are not broken. - [ ] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [ ] If working on CE, submit an MR to EE with the changes as well. See merge request !6517
| * | | Move reply by email docs to a new locationdocs/refactor-reply-by-emailAchilleas Pipinellis2016-09-257-626/+631
| |/ / | | | | | | | | | [ci skip]
* | | Merge branch 'tmatesoft/gitlab-ce-migrate-from-svn-doc-update' into 'master' Achilleas Pipinellis2016-10-111-2/+106
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add SubGit to the tools of SVN migration Originally from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6549. See merge request !6803
| * | | Refactor the SubGit/SVN documentationAchilleas Pipinellis2016-10-111-40/+52
| | | | | | | | | | | | | | | | [ci skip]
| * | | Update migrating_from_svn.md document on migration from SVN to GitLab as ↵TMate Software Support2016-10-101-23/+29
| | | | | | | | | | | | | | | | suggested by @axil in MR 6549.
| * | | Update migrating_from_svn.md TMate Software Support2016-09-271-3/+89
| | | | | | | | | | | | Documentation updated to cover Git/SVN mirror approach to migration from SVN to GitLab.
* | | | Merge branch 'document-ci-shell-trace-variable' into 'master' Achilleas Pipinellis2016-10-112-0/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the new CI_DEBUG_TRACE variable a feature that will be introduced in GitLab Runner v1.7 Related to https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/339 See merge request !6700
| * | | | Document the new CI_DEBUG_TRACE variableNick Thomas2016-10-112-0/+36
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'new-gitlab-users-clear_all_authentication_tokens-task' into ↵Robert Speicher2016-10-111-0/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add a new gitlab:users:clear_all_authentication_tokens task ## What are the relevant issue numbers? Part of #22537. See merge request !6745
| * | | | | Add a new gitlab:users:clear_all_authentication_tokens taskRémy Coutable2016-10-111-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'gitlab-basics' into 'master' Achilleas Pipinellis2016-10-1121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant images from GitLab basics docs See merge request !6799
| * | | | | | Remove redundant imagesAchilleas Pipinellis2016-10-1121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'nahtnam/gitlab-ce-ci-test-phoenix' into 'master' Achilleas Pipinellis2016-10-112-0/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an example for testing a phoenix application with Gitlab CI _Originally opened at !5074 by @nahtnam._ - - - ## What does this MR do? Add an example on how to setup testing on phoenix ## Are there points in the code the reviewer needs to double check? Grammar and formatting ## Why was this MR needed? https://twitter.com/gitlab/status/749898132008337408 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6794
| * | | | | | | Improve a bit the example .gitlab-ci.yml for Phoenixnahtnam/gitlab-ce-ci-test-phoenixRémy Coutable2016-10-111-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Add an example for testing a phoenix application with Gitlab CI.Manthan Mallikarjun2016-10-112-0/+53
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'gitlab-basics' into 'master' Achilleas Pipinellis2016-10-1177-177/+149
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | Replace images in GitLab basics docs See merge request !6786
| * | | | | Rearrange GitLab basics READMEsAchilleas Pipinellis2016-10-112-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | New images for GitLab basics "Create MR" docsAchilleas Pipinellis2016-10-118-29/+20
| | | | | |
| * | | | | Add new images in GitLab basics "Create issue" docsAchilleas Pipinellis2016-10-119-15/+18
| | | | | |
| * | | | | Reference the web editor docs in GitLab basics "Add a file"Achilleas Pipinellis2016-10-111-25/+3
| | | | | |
| * | | | | New images for GitLab basics "Fork project" docsAchilleas Pipinellis2016-10-115-9/+10
| | | | | |
| * | | | | Reference the web editor docs in GitLab basics "Create a branch"Achilleas Pipinellis2016-10-113-37/+10
| | | | | |
| * | | | | New images for GitLab basics "Create group" docsAchilleas Pipinellis2016-10-119-23/+28
| | | | | |
| * | | | | Add new images for GitLab basics "create project"Achilleas Pipinellis2016-10-115-12/+15
| | | | | |
| * | | | | Use new image for gitlab-basics/command-line-commands.mdgitlab-basicsAchilleas Pipinellis2016-10-104-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Refactor SSH key addition in GitLab basicsAchilleas Pipinellis2016-10-1010-17/+21
| | | | | |
| * | | | | Change img dir nameAchilleas Pipinellis2016-10-1053-39/+39
| | | | | |
* | | | | | Merge branch 'dz-cleanup-routing' into 'master' Dmitriy Zaporozhets2016-10-111-0/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove NamespacesController * removes unnecessary NamespacesController. The main purpose of this controller was redirect to group or user page when URL like https://gitlab.com/gitlab-org was used. Now this functionality is handled by constrainers (like this https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/routes/user.rb#L17-21) and take user to correct controller right from the start. * serve non existing API routes like `/api/v3/whatever` with Grape instead of Rails. Before this change wrong API url was served by rails with not obvious 404, 405 & 500 errors See merge request !6733
| * | | | | Better wording in API readmeDmitriy Zaporozhets2016-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Replace undefined Grape routing code from 400 to 404Dmitriy Zaporozhets2016-10-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Fix API specs behaviour for invalid routingDmitriy Zaporozhets2016-10-101-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'jmcgeheeiv/gitlab-ce-patch-1' into 'master' Achilleas Pipinellis2016-10-101-23/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve backup doc readability From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3761 See merge request !6781
| * | | | | | Add registry to skipped data in backup raketask docsAchilleas Pipinellis2016-10-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Added "CI secret variables" per @axil.John McGehee2016-09-291-3/+3
| | | | | | |
| * | | | | | Rebase and resolve conflicts in backup doc for !3761john McGehee2016-09-281-23/+34
| | | | | | |
* | | | | | | Merge branch 'jerdog/gitlab-ce-update-start-using-git-documentation' into ↵2529-error-502-when-creating-mrAchilleas Pipinellis2016-10-101-11/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Changes to make Git basics more intuitive From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6420 See merge request !6777
| * | | | | | | Updating changes based on feedback from @connorsheaJerdog2016-10-101-5/+5
| | | | | | | |
View Lorry Controller Status