summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | multi-file commitMarc Siegfriedt2016-10-051-0/+87
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add docs and tests - add additional validation allow move without content updated response
* | | | | | | | | | | | | | Merge branch 'issue-board-api-support' into 'master' Dmitriy Zaporozhets2016-10-061-0/+251
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue Board API support ## What does this MR do? Adds support for Issue Board in the API. ## Are there points in the code the reviewer needs to double check? ~~Double check whether the Issue Board list movement fix is needed.~~ *Moved to a separate issue.* [#22890](https://gitlab.com/gitlab-org/gitlab-ce/issues/22890) ## Why was this MR needed? Currently the API offers partial support to a project's Issue Board indirectly through Labels. This MR adds support for listing, creating, moving and removing board lists. ## 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) - [X] API support added - Tests - [X] Added for this feature/bug - [X] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] 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) ## What are the relevant issue numbers? [#22195](https://gitlab.com/gitlab-org/gitlab-ce/issues/22195) See merge request !6646
| * | | | | | | | | | | | | Added Issue Board API supportAndre Guedes2016-10-051-0/+251
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Includes documentation and tests
* | | | | | | | | | | | | Merge branch '21337-introduce-git-strategy-none' into 'master' Achilleas Pipinellis2016-10-061-8/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document GIT_STRATEGY=none ## What does this MR do? Adds documentation for the new `GIT_STRATEGY=none` option in GitLab Runner v1.7 ## Are there points in the code the reviewer needs to double check? Speling and grammar, of course. I'm using the term 'project workspace' to refer to the build directory, which is a Jenkins-ism. Is there preferred alternative wording? ## Why was this MR needed? Discoverability of new feature ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - <strike>[ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added</strike> - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - <strike>[ ] API support added</strike> - <strike>Tests</strike> - <strike>[ ] Added for this feature/bug</strike> - <strike>[ ] All builds are passing</strike> - <strike>[ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)</strike> - [ ] 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) ## What are the relevant issue numbers? Closes #21337 Depends on http://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/332 See merge request !6577
| * | | | | | | | | | | | | Document GIT_STRATEGY=noneNick Thomas2016-10-051-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | Merge branch 'docs/ca-feedback' into 'master' Achilleas Pipinellis2016-10-062-15/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more info in Cycle Analytics docs - Clarify the Plan to Code stages in Cycle Analytics docs based on feedback https://about.gitlab.com/2016/09/21/cycle-analytics-feature-highlight/#comment-2915715168 - Add a workflow example See merge request !6562
| * | | | | | | | | | | | | Clarify some more the Cycle Analytics workflow exampleAchilleas Pipinellis2016-10-061-16/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | Add example Cycle Analytics workflowdocs/ca-feedbackAchilleas Pipinellis2016-10-041-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | Take a new screenshot for Cycle AnalyticsAchilleas Pipinellis2016-10-031-0/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Clarify that the `production` environment is case-sensitiveAchilleas Pipinellis2016-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22533
| * | | | | | | | | | | | | Clarify Plan and Code stages moreAchilleas Pipinellis2016-10-031-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Clarify what it means Test stage is not calculated in TotalAchilleas Pipinellis2016-10-031-1/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix markdown URL linkAchilleas Pipinellis2016-10-031-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Clarify the Plan to Code stages in Cycle Analytics docsAchilleas Pipinellis2016-09-281-3/+4
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | Merge branch 'doc/using_docker_images' into 'master' Sean McGivern2016-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix small typo in using_docker_images.md, file is called `build_script` (using underscore) ## What does this MR do? This MR fixes a very small typo in the using_docker_images.md documentation, a space was used in the filename `build_script` while it should be an underscore. Not sure of a MR is the best way to get this changed, trying it anyway :). ## Moving docs to a new location? No See merge request !6682
| * | | | | | | | | | | | | Fix small typo in using_docker_images.md, file is called `build_script` ↵Sander Dalemans2016-10-031-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (using underscore)
* | | | | | | | | | | | | Merge branch 'doc-admin-housekeeping' into 'master' Rémy Coutable2016-10-052-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update housekeeping docs for new GitLab UI. I spent far too much time trying to find this button. See merge request !6679
| * | | | | | | | | | | | | Update housekeeping docs for new GitLab UI.Wolfgang Faust2016-10-042-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | deployment refs in own folder, new method for creating refszj-save-environment-deployment-refsZ.J. van de Weg2016-10-041-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Save a fetchable ref per deployementZ.J. van de Weg2016-10-041-0/+13
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'add-email-subject-suffix' into 'master' Rémy Coutable2016-10-031-9/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add configurable email subject suffix ## Why was this MR needed? I noticed that there is a commit 44ab156e 3 years ago which removes email subject prefix actually we do need an special part of the email subject which makes the email subject easy to identify we just need to make it configurable rather than remove it. See merge request !6172
| * | | | | | | | | | | | add configurable email subject suffixFu Xu2016-10-031-9/+11
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix/import-export-admin' into 'master' Robert Speicher2016-10-031-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Import/Export for non-admin users Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21315 Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 and https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/ See merge request !6080
| * | | | | | | | | | | | Enable import/export back for non-adminsfix/import-export-adminJames Lopez2016-10-031-1/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'update-gitlab-shell-3-6-3' into 'master' Rémy Coutable2016-10-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GITLAB_SHELL_VERSION to 3.6.3 Because VERSION at the gitlab-shell v3.6.2 tag was still 3.6.1: https://gitlab.com/gitlab-org/gitlab-shell/blob/v3.6.2/VERSION (my bad!) VERSION at the v3.6.3 tag is now 3.6.3: https://gitlab.com/gitlab-org/gitlab-shell/blob/v3.6.3/VERSION See merge request !6621
| * | | | | | | | | | | | Update gitlab-shell to 3.6.3Rémy Coutable2016-10-031-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Add a /wip slash commandThomas Balthazar2016-10-031-1/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It toggles the 'WIP' prefix in the MR title.
* | | | | | | | | | | Link to the "What requires downtime?" page from the Migration Style GuideNick Thomas2016-10-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge branch 'cs-frontend-guidelines' into 'master' Jacob Schatz2016-10-012-0/+226
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Frontend Development Guidelines to the Developer Documentation ## What does this MR do? WIP incomplete draft of some Frontend Development Guidelines for contributors to the project, new hires, and for other projects and persons to look to for guidance. These are all subject to removal, modification, etc. If you disagree with any of these, please feel free to voice your concerns :) ## Why was this MR needed? There are a number of guidelines we currently follow implicitly, this makes them more official and available for reference/discussion. It also exists as a reference for certain patterns we use which may be unfamiliar to new contributors, e.g. the per-page JS. Feel free to give feedback on wording, missing sections/guidelines, whether a guideline should even exist, etc. See merge request !5477
| * | | | | | | | | | | Update Frontend Docs based on feedback.cs-frontend-guidelinesConnor Shea2016-09-211-18/+18
| | | | | | | | | | | |
| * | | | | | | | | | | Add a section on vue and one on supported browsers.Connor Shea2016-09-211-0/+14
| | | | | | | | | | | |
| * | | | | | | | | | | Add Overview section detailing our frontend stack. [ci skip]Connor Shea2016-09-211-5/+44
| | | | | | | | | | | |
| * | | | | | | | | | | Add short Testing section, minor fixes.Connor Shea2016-09-211-1/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Add CSP and SRI information [ci skip]Connor Shea2016-09-211-3/+71
| | | | | | | | | | | |
| * | | | | | | | | | | Further revisions/additions [ci skip]Connor Shea2016-09-211-6/+17
| | | | | | | | | | | |
| * | | | | | | | | | | Add more information on page-specific JS.Connor Shea2016-09-211-19/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | Initial incomplete draft of the Frontend Development Guidelines.Connor Shea2016-09-212-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge branch 'update-update-guides-for-8.13' into 'master' Rémy Coutable2016-09-304-5/+210
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update "Installation from source" guide for 8.13.0 Following the steps from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1. See merge request !6565
| * | | | | | | | | | | | Update the "Update Ruby" part for the 8.10 -> 8.11 as wellupdate-update-guides-for-8.13Rémy Coutable2016-09-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Update the "Update Ruby" part since we still support Ruby 2.1 for nowRémy Coutable2016-09-302-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Update "Installation from source" guide for 8.13.0Rémy Coutable2016-09-282-3/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch 'patch-3' into 'master' best-design-patternDmitriy Zaporozhets2016-09-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added "View wiki pages" to list of actions granted to various user permission levels in a project. This MR clarifies the actions allowed by various user permission levels in a project to include "View wiki pages" See merge request !5749
| * | | | | | | | | | | | | Added "View wiki pages" to list of actions granted to various user ↵Dustin Miller2016-08-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission levels in a project.
* | | | | | | | | | | | | | Merge branch 'patch-6' into 'master' Dmitriy Zaporozhets2016-09-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Session Cookie header ## What does this MR do? This MR fixes the wiki text header for the Session Cookie section ## Are there points in the code the reviewer needs to double check? It is markdown so probably not. Two very simple changes - first is replacing a dot with a space (was causing invalid markdown, not rendered as a header) and capitalized the word Cookie to match the other header formatting. ## Why was this MR needed? Fix the wiki documentation. ## Screenshots (if relevant) None. ## Does this MR meet the acceptance criteria? I can't imagine it wouldn't. - [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) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] 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) ## What are the relevant issue numbers? I didn't think this warranted an issue as it is just some simple wiki markdown formatting with little to no consequence. See merge request !6584
| * | | | | | | | | | | | | | Fixed Session Cookie headerAlan Moore2016-09-291-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'patch-6' into 'master' Dmitriy Zaporozhets2016-09-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smaller formatting fix See the contents, it's just a smaller fix in formatting. No detailed description needed - just keeping the docs clean See merge request !6614
| * | | | | | | | | | | | | | | Smaller formatting fixNils Brinkmann2016-09-301-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'master' into 'fix_oauth_doc'Achilleas Pipinellis2016-09-3028-6/+1700
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # doc/api/oauth2.md
| * | | | | | | | | | | | | | | Expose the Koding application settings in the APIkoding-setting-apiDJ Mountney2016-09-291-3/+9
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow the Koding app to enable the integration itself once is has authorized an admin user using the application secrets.
| * | | | | | | | | | | | | | Merge branch 'issue_22382' into 'master' Rémy Coutable2016-09-291-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose project share expiration_date field on API closes #22382 See merge request !6484