summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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
| | | | | | |
| | * | | | | Use gitlab-workhorse 0.7.1Jacob Vosmaer2016-03-212-2/+2
| | | |_|/ / | | |/| | |
| * | | | | Fix typos and dentingZeger-Jan van de Weg2016-03-212-3/+2
| | | | | |
| * | | | | Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-212-79/+11
| | | | | |
| * | | | | Dry destroy action on issuablesZeger-Jan van de Weg2016-03-192-2/+2
| | | | | |
| * | | | | Soft delete issuablesZeger-Jan van de Weg2016-03-192-5/+101
| |/ / / /
* | | | | Tweaks, refactoring, and specsDouwe Maan2016-03-201-0/+1
|/ / / /
* | | | Merge branch 'master' into 'master' Achilleas Pipinellis2016-03-191-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about `image` and `services` field at `job` level in the `.gitlab-ci.yml` documentation Fixes #14366 /cc @tmaczukin @ayufan @axil See merge request !3277
| * | | | fixed md anchor linkPat Turner2016-03-181-2/+2
| | | | |
| * | | | Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366Pat Turner2016-03-181-2/+2
| | | | |
| * | | | removed anchor as unsupported in markdownPat Turner2016-03-171-2/+2
| | | | |
| * | | | Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366Pat Turner2016-03-171-0/+2
| | | | |
* | | | | Add note in rest of update guidesAchilleas Pipinellis2016-03-183-0/+27
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'master' into docs_select_version_to_installAchilleas Pipinellis2016-03-18236-1818/+7354
|\ \ \ \ \
| * \ \ \ \ Merge branch 'fix-issue-14338' into 'master' Achilleas Pipinellis2016-03-185-5/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use relative links in `doc`, fix broken generated HTML links Links like (doc/web_hooks/web_hooks.md) work in the GitLab source code web interface, but the HTML generator produces broken links in the `doc` subdirectories: http://doc.gitlab.com/ce/hooks/doc/web_hooks/web_hooks.html instead of the right one http://doc.gitlab.com/ce/web_hooks/web_hooks.html in http://doc.gitlab.com/ce/hooks/custom_hooks.html. Fixes #14338 See merge request !3261
| | * | | | | Use relative links in `doc`, fix broken generated HTML linksAnatoly Borodin2016-03-175-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Links like (doc/web_hooks/web_hooks.md) work in the GitLab source code web interface, but the HTML generator produces broken links in the `doc` subdirectories: http://doc.gitlab.com/ce/hooks/doc/web_hooks/web_hooks.html instead of the right one http://doc.gitlab.com/ce/web_hooks/web_hooks.html in http://doc.gitlab.com/ce/hooks/custom_hooks.html. Fixes #14338 [ci skip] Signed-off-by: Anatoly Borodin <anatoly.borodin@gmail.com>
| * | | | | | Remove CI duplication.ci-duplicationSytse Sijbrandij2016-03-171-36/+1
| | | | | | |
| * | | | | | Bump Git version requirement to 2.7.4Douwe Maan2016-03-171-5/+5
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'rm_duplicate_cache_ci_docs' into 'master' Achilleas Pipinellis2016-03-171-62/+48
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge duplicate cache entry in CI docs See merge request !3208
| | * \ \ \ \ Merge branch 'master' into rm_duplicate_cache_ci_docsAchilleas Pipinellis2016-03-179-36/+581
| | |\ \ \ \ \
| | * | | | | | Merge duplicate cache entry in CI docsrm_duplicate_cache_ci_docsAchilleas Pipinellis2016-03-141-60/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-173-2/+25
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | External Users The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects. Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users) ![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png) See merge request !3171
| | * | | | | | Add missing API docs on external userAchilleas Pipinellis2016-03-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | Refactor external users docsAchilleas Pipinellis2016-03-171-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-154-19/+482
| | |\ \ \ \ \ \
| | * | | | | | | Doc external users featureZeger-Jan van de Weg2016-03-153-2/+20
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'patch-1' into 'master' Robert Schilling2016-03-171-1/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in README.md See merge request !3250
| | * | | | | | Fix typo in README.md.Mark Pundsack2016-03-161-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'danielcarraro/gitlab-ce-feature/omniauth-auth0-gem' into 'master' Robert Speicher2016-03-162-0/+90
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | omniauth-auth0 gem support See merge request !3246
| | * | | | | | Added omniauth-auth0 Gem + Applicable Documentation.Daniel Carraro2016-03-162-0/+90
| | | | | | | |
| * | | | | | | Fix golang shasum invocationJacob Vosmaer2016-03-161-1/+1
| | | | | | | |
| * | | | | | | Update Git source installation steps to 2.7.3Jacob Vosmaer2016-03-161-2/+3
| |/ / / / / /
| * | | | | | Merge branch 'doc-updates' into 'master' Achilleas Pipinellis2016-03-162-12/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix requirements.md link and improve PostgreSQL commands - Point requirements.md link to the correct location - Link to gitlab installation.md document instead of github - Use psql command switch to run specified SQL commands for creation of user and database permissions. - Instead of requiring a comment like `# Do not type the 'template1=#', this is part of the prompt` it may be easier to just use the command switch with `psql` to execute the SQL commands. *forgot [ci skip] :(* See merge request !3176
| | * | | | | | Use relative link for installation.mdChris Wilson2016-03-151-1/+1
| | | | | | | |
| | * | | | | | Revert to relative requirements.md link use gitlab.com link for installation ↵Chris Wilson2016-03-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guides.
| | * | | | | | Fix requirements.md link and improve PostgreSQL commandsChris Wilson2016-03-112-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Point requirements.md link to the correct location - Link to gitlab installation.md document instead of github - Use psql command switch to run specified SQL commands for creation of user and database permissions.
| * | | | | | | Merge branch 'master' into git-2-7-3Douwe Maan2016-03-154-19/+482
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge branch 'css-style-guide' into 'master' Jacob Schatz2016-03-151-0/+194
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSS style guide Working towards what was discussed in #13552, this adds the [SCSS Linter gem](https://github.com/brigade/scss-lint) for style guide conformity in CI. TODO: - [x] Agree on and write SCSS Style Guide Documentation. - [x] Document the `scss-lint` config file. - [x] Figure out how best to run this in CI, right now it's taking longer than I would think it should. - [x] Use CSSComb for auto-correction (Maybe just include a CSSComb config file and have developers run the node package manually if they're interested in using it?). My logic for not using CSSComb in the first place is that, AFAIK, we don't currently require Node/NPM, even in the dev environment. Maybe I'm wrong about that? `scss-lint` is a Ruby implementation of a similar concept, but it doesn't include autocorrect. Is there a way we can run get GitLab CI to run `scss-lint` without having to put together the full GitLab application? Seeing as it's just static analysis, it seems like a waste of time/resources. /cc @jschatz1 @rspeicher See merge request !3069
| | | * | | | | | Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add ↵connorshea2016-03-141-0/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation for SCSS Style Guide. See !3069 for more information.
| | * | | | | | | Merge branch 'patch-1' into 'master' Jeroen van Baarsen2016-03-151-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in Ruby CI test and deploy example [skip ci] See merge request !3201
| | | * | | | | | Fix typo in Ruby CI test and deploy exampleJasper Denkers2016-03-141-1/+1
| | | | | | | | |
| | * | | | | | | Windows CI support is full since Runner v1.0.0Achilleas Pipinellis2016-03-151-1/+1
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | Merge branch 'fix-commit-status-rendering' into 'master' Robert Speicher2016-03-151-7/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup Ci::Commit, Ci::Build and CommitStatus views This MR tries to do first sweep of cleanups to Ci::Commit and Ci::Build objects removing all view-related functions and fixing the API from other side. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/6046 See merge request !2760
| | | * | | | | | Cleanup CiCommit and CiBuildKamil Trzcinski2016-03-141-7/+0
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove all view related methods from Ci::Build and CommitStatus - Remove unused Ci::Commit and Ci::Build methods - Use polymorphism to render different types of CommitStatus
| | * | | | | | Merge branch 'gitlab-ci-yaml-updates' into 'master' Douwe Maan2016-03-141-11/+287
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New CI YAML features This introduces a couple of small `.gitlab-ci.yml` features: 1. Documentation for: Allow to use YAML anchors when parsing the `.gitlab-ci.yml`: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2958 2. Ignore jobs that start with `.` 3. Allow to pass name of created artifacts archive in `.gitlab-ci.yml` 4. Allow to define on which builds the current one depends on These are really small changes so it makes not sense to create a separate merge requests for them. @axil Could you review the documentation part? The implementation on GitLab Runner side: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/113. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/13755 https://gitlab.com/gitlab-org/gitlab-ce/issues/14211 https://gitlab.com/gitlab-org/gitlab-ce/issues/3423 cc @grzesiek @axil @DouweM See merge request !3182
| | | * | | | | Add yaml definition to codeblockgitlab-ci-yaml-updatesAchilleas Pipinellis2016-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]