summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge branch 'master' into add-ability-to-archive-a-project-via-api-14296Zeger-Jan van de Weg2016-03-241-3/+24
| |\ \ \
| * | | | PUT becomes POST on archiving endpointsZeger-Jan van de Weg2016-03-241-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Also the specs have a minor improvement. Mainly the access right spec. Changes are reflected in the docs
| * | | | Add endpoints for archiving and unarchivingZeger-Jan van de Weg2016-03-231-0/+164
| | | | |
* | | | | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857.
* | | | | Merge branch '2364-fallback-to-in-reply-to-header' into 'master' Douwe Maan2016-03-301-24/+84
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fall back to In-Reply-To and References headers when sub-addressing is not available _Originally opened at !3024 by @dabit._ - - - Fixes #2364 Summary of the changes: - No more need to have the `%{key}` placeholder in the `incoming_email.address` - The fallback message id format is `reply-[key]@[gitlab_host]` (reminder: it doesn't have to be a real email address) - The fallback message id that includes the reply key is added to both `References` header - Documentation for the "Reply by email" feature updated See merge request !3305
| * | | | | Improve and finish the fallback to the In-Reply-To and References header for ↵2364-fallback-to-in-reply-to-headerRémy Coutable2016-03-251-24/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the reply-by-email feature A few things to note: - The IncomingEmail feature is now enabled even without a correctly-formatted sub-address - Message-ID for new thread mail are kept the same so that subsequent notifications to this thread are grouped in the thread by the email service that receives the notification (i.e. In-Reply-To of the answer == Message-ID of the first thread message) - To maximize our chance to be able to retrieve the reply key, we look for it in the In-Reply-To header and the References header - The pattern for the fallback reply message id is "reply-[key]@[gitlab_host]" - Improve docs thanks to Axil
* | | | | | Merge branch ↵Robert Speicher2016-03-291-29/+42
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description' into 'master' api - expose label description Resolves #14415 See merge request !3314
| * | | | | api - expose label descriptionMariusz Jachimowicz2016-03-241-29/+42
| | |_|/ / | |/| | |
* | | | | Merge branch 'doc-update-8.5-to-8.6-fix-steps-order' into 'master' Rémy Coutable2016-03-291-21/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix order of steps to prevent PostgreSQL errors when running migration Supersedes https://github.com/gitlabhq/gitlabhq/pull/10100. /cc @stanhu @rodrigomanhaes See merge request !3355
| * | | | | Fix order of steps to prevent PostgreSQL errors when running migration [ci skip]doc-update-8.5-to-8.6-fix-steps-orderRodrigo Manhães2016-03-221-21/+21
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-03-285-227/+293
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'update_ldap_docs' into 'master' Drew Blessing2016-03-284-227/+292
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ldap docs Related to gitlab-org/gitlab-ee#397 @axil What do you think of moving LDAP configuration docs to `adminstration/auth/ldap.md`? Then we'll probably need to add the relevant group link configuration piece to some user group documentation. We can cross-link and deprecate the current `integration/ldap.md` location. See merge request !3336
| | * | | | Update LDAP docs [ci skip]Drew Blessing2016-03-224-227/+292
| | | | | |
| * | | | | Merge branch 'api-ability-to-backdate-newly-created-issues-12628' into 'master' Robert Speicher2016-03-281-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Back dating of issues when creating through the API Closes #12628 See merge request !3408
| | * | | | | Back dating of issues when creating throught the APIZeger-Jan van de Weg2016-03-281-0/+1
| | | |_|_|/ | | |/| | |
* | | | | | Merge pull request #9978 from fantasywind/patch-2Achilleas Pipinellis2016-03-281-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update github.md
| * | | | | Update github default callback urlChia Yu Pai2016-03-011-2/+1
| | | | | |
| * | | | | Update github.mdChia Yu Pai2016-01-151-0/+1
| | | | | | | | | | | | | | | | | | add default callback URL path
* | | | | | Fix typos in webhooks docs. Achilleas Pipinellis2016-03-271-5/+4
| | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14660
* | | | | | Merge branch 'rs-remove-release-docs' into 'master' Dmitriy Zaporozhets2016-03-268-585/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove release docs from the CE repository More detailed, updated, and accurate versions of these docs now live in https://gitlab.com/gitlab-org/release-tools Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2346 [ci skip] See merge request !3393
| * | | | | Remove release docs from the CE repositoryrs-remove-release-docsRobert Speicher2016-03-248-585/+0
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | More detailed, updated, and accurate versions of these docs now live in https://gitlab.com/gitlab-org/release-tools [ci skip]
* | | | | Merge branch 'clarify_lfs' into 'master' Achilleas Pipinellis2016-03-251-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify LFS configuration A user on Twitter was confused (rightfully so) because LFS admin docs suggest you must set a storage path. In fact, Omnibus defaults to a very sane location. Add a comment to the snippet outlining the default. See merge request !3388
| * | | | | Clarify LFS configurationDrew Blessing2016-03-241-0/+4
| |/ / / /
* | | | | Describe CI stuff.Sytse Sijbrandij2016-03-241-1/+1
|/ / / /
* | | | SCSS Style Guide fixes.connorshea2016-03-231-3/+24
| |_|/ |/| | | | | | | | | | | | | | Fix a typo and add a section on ignoring issues. [ci skip]
* | | Merge branch 'grafana_documentation' into 'master' Drew Blessing2016-03-227-1/+120
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grafana installation and configuration documentation Adding documentation for installing and configuring Grafana. This also includes providing dashboards users can import. Fixes gitlab-org/omnibus-gitlab#1008 cc/ @axil See merge request !3015
| * | | Grafana installation and configuration documentation. [ci skip]Drew Blessing2016-03-227-1/+120
| | |/ | |/|
* | | Merge branch 'drop_db_before_restore' into 'master' Robert Speicher2016-03-223-0/+87
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reload the schema before restoring a database backup If a user tries to downgrade and restore after a failed upgrade, the database may still contain newer tables. Reload the older schema before restoring the database to avoid future upgrade problems. Also, add a rake task to help users add migration versions to the database so it's easier to recover from these errors if they do occur. Fixes #13419 See merge request !2807
| * | Reload the schema before restoring a database backupDrew Blessing2016-03-213-0/+87
| | |
* | | Merge branch 'doc_group_visibility' into 'master' Achilleas Pipinellis2016-03-221-8/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add docs on group visibility Accompanying https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3323 See merge request !3338
| * | | Add docs on group visibilityAchilleas Pipinellis2016-03-221-8/+15
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'gitlab_intro_docs' into 'master' Achilleas Pipinellis2016-03-229-81/+163
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab intro docs Related to https://gitlab.com/gitlab-org/marketing_monthly_release/issues/1 --- Need refactor: - Create a new project - Create a new group - Create a new issue - Assign labels to issues - Use milestones as an overview of your project's tracker - Fork a project and contribute to it - Create a new merge request - Automatically close issues from merge requests (include GitLab.com pattern) - GitLab CI quick start guide (make it easier to follow) Moved to https://gitlab.com/gitlab-org/gitlab-ce/issues/8068 See merge request !3225
| * | | Remove redundant wordAchilleas Pipinellis2016-03-221-1/+1
| | | | | | | | | | | | | | | | [ci skip]
| * | | Refactor award emoji doc a bitAchilleas Pipinellis2016-03-221-4/+4
| | | | | | | | | | | | | | | | [ci skip]
| * | | Fix grammar in intro guideAchilleas Pipinellis2016-03-221-2/+2
| | | |
| * | | Merge Git basics into Start using GitAchilleas Pipinellis2016-03-223-59/+63
| | | | | | | | | | | | | | | | [ci skip]
| * | | Add award emoji docsAchilleas Pipinellis2016-03-226-1/+49
| | | | | | | | | | | | | | | | [ci skip]
| * | | Change titles to be more descriptiveAchilleas Pipinellis2016-03-221-3/+3
| | | |
| * | | Remove blockquotesAchilleas Pipinellis2016-03-211-5/+5
| | | |
| * | | Simplify install and update sectiongitlab_intro_docsAchilleas Pipinellis2016-03-191-5/+2
| | | | | | | | | | | | | | | | [ci skip]
| * | | Add h1 headingAchilleas Pipinellis2016-03-191-0/+2
| | | |
| * | | Add more options and missing linksAchilleas Pipinellis2016-03-191-10/+12
| | | | | | | | | | | | | | | | [ci skip]
| * | | Merge branch 'master' into gitlab_intro_docsAchilleas Pipinellis2016-03-1920-123/+413
| |\ \ \
| * | | | No newlines between list itemsAchilleas Pipinellis2016-03-181-23/+12
| | | | |
| * | | | First draft on GitLab intro docsAchilleas Pipinellis2016-03-151-0/+40
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'feature-ci-only-except-trigger' into 'master' Kamil Trzciński2016-03-221-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI: Add 'triggers' keyword to 'only' and 'except' lists to allow control over when triggers cause builds to run Currently, the `only` and `except` keywords in `.gitlab-ci.yml` only accept ref names or the special `branches` and `tags` keywords. However, these are primarily useful when controlling how repository activity affects the creation of builds. In my case, instead of building on every commit, I'd like to use the following logic: - If the repository is tagged, do a build. - Any other normal commits should not cause a build. - If a build is triggered via the API, always create one for the specified ref. From what I can tell, this isn't possible via the existing YAML syntax. In this MR, I introduce a new keyword `triggers` that goes along with `branches` and `tags`. I can implement the logic above using the following job configuration: ```yaml only: - tags - triggers ``` I updated the tests and documentation to reflect this and everything seems to pass. See merge request !3230
| * | | | | add some documentation for `triggers` keyword [ci skip]Jason Roehm2016-03-151-1/+12
| | | | | |
* | | | | | Merge branch 'master' into issue_12658Douwe Maan2016-03-214-7/+34
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
| * | | | | Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-212-2/+2
| |\ \ \ \ \
| | * | | | | Gitlab-workhorse tags have "v" nowworkhorse-0.7.1Jacob Vosmaer2016-03-212-2/+2
| | | | | | |