3229 Commits
Author SHA1 Message Date
Rémy Coutable 1755b1643c Merge branch '8-6-stable' of github.com:gitlabhq/gitlabhq into 8-6-stable 2016-03-30 09:39:26 +02:00
Rémy Coutable bc80f7faff Merge branch 'doc-update-8.5-to-8.6-fix-steps-order' into 'master'
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
2016-03-29 12:37:44 +02:00
Nitin Madhok aed6126159 Update patch_versions.md 2016-03-26 00:58:44 -04:00
Robert SpeicherandRémy Coutable 3129e135eb Merge branch 'drop_db_before_restore' into 'master'
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
2016-03-23 12:25:06 +01:00
Achilleas PipinellisandRémy Coutable 382dead4b8 Merge branch 'doc_group_visibility' into 'master'
Add docs on group visibility

Accompanying https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3323

See merge request !3338
2016-03-22 12:37:34 +01:00
Achilleas PipinellisandRémy Coutable cb77958b67 Merge branch 'gitlab_intro_docs' into 'master'
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
2016-03-22 12:36:53 +01:00
Douwe MaanandRémy Coutable d0a7dfd66d Merge branch '2489-soft-delete-issues' into 'master'
Soft delete issuables

Fixes #2489 

What still needs to happen: research on the indexes, the gem suggests a [lot of changes](https://github.com/rubysherpas/paranoia#about-indexes) though this is probably a good idea to discuss and I'm unsure on the impact of an omnibus upgrade as I suspect creating about 10 new indexes has a large impact on the downtime.

TODO: 
- [x] Also group owners can ***soft*** delete
- [x] Button should be hidden

See merge request !2982
2016-03-22 12:36:02 +01:00
Kamil TrzcińskiandRémy Coutable 0fcea6b660 Merge branch 'feature-ci-only-except-trigger' into 'master'
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
2016-03-22 12:34:20 +01:00
Robert SpeicherandRobert Speicher c8cc1c16d1 Merge branch 'issue_12658' into 'master'
Add group visibility level

Supersedes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3051

Closes #12658

See merge request !3323
2016-03-21 21:37:57 -04:00
Rémy Coutable c5e015e972 Merge branch 'workhorse-0.7.1' into 'master'
Use gitlab-workhorse 0.7.1

A small extra defense against interrupted git raw responses. Nice to
have in 8.6 because we introduce /raw/ caching; it would be
unfortunate if incorrect (truncated) responses got cached.

See merge request !3330
2016-03-21 16:41:12 +01:00
Achilleas PipinellisandRémy Coutable dd2b4d7bc5 Merge branch 'master' into 'master'
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
2016-03-21 12:28:43 +01:00
Achilleas PipinellisandRémy Coutable dc0b12dc59 Merge branch 'docs_select_version_to_install' into 'master'
Add note in upgrade guide to choose the correct version tag

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3448

@rspeicher I'm assigning to you since as a release manager you should know better. Let's keep it in this guide for now and then start copying it in the future ones.

See merge request !2284
2016-03-18 20:32:10 +01:00
Achilleas PipinellisandRémy Coutable 7847cdbc3e Merge branch 'fix-issue-14338' into 'master'
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
2016-03-18 09:53:11 +01:00
Achilleas PipinellisandRémy Coutable fc8894b635 Merge branch 'ci-duplication' into 'master'
Remove CI duplication.



See merge request !3290
2016-03-18 09:52:55 +01:00
Robert SpeicherandRémy Coutable e0542185d3 Merge branch 'git-2-7-4' into 'master'
Bump Git version requirement to 2.7.4

[ci skip]

See merge request !3281
2016-03-18 09:48:41 +01:00
Achilleas Pipinellis 9392e1375c Merge branch 'rm_duplicate_cache_ci_docs' into 'master'
Merge duplicate cache entry in CI docs



See merge request !3208
2016-03-17 14:32:22 +00:00
Douwe Maan 21af7459ab Merge branch '4009-external-users' into 'master'
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
2016-03-17 14:15:38 +00:00
Achilleas Pipinellis 5b1db58c85 Merge branch 'master' into rm_duplicate_cache_ci_docs 2016-03-17 15:56:44 +02:00
Achilleas Pipinellis 956e914307 Add missing API docs on external user
[ci skip]
2016-03-17 12:21:12 +02:00
Robert Schilling 4171933c09 Merge branch 'patch-1' into 'master'
Fix typo in README.md



See merge request !3250
2016-03-17 07:35:23 +00:00
Achilleas Pipinellis cde7eee73e Refactor external users docs
[ci skip]
2016-03-17 09:24:06 +02:00
Robert Speicher 6349f4909b Merge branch 'danielcarraro/gitlab-ce-feature/omniauth-auth0-gem' into 'master'
omniauth-auth0 gem support

See merge request !3246
2016-03-16 20:33:07 +00:00
Mark Pundsack 315d875954 Fix typo in README.md. 2016-03-16 18:04:42 +00:00
Jacob Vosmaer 96ac302127 Fix golang shasum invocation 2016-03-16 13:41:07 +01:00
Jacob Vosmaer 25600f530f Update Git source installation steps to 2.7.3 2016-03-16 13:40:27 +01:00
Daniel CarraroandRémy Coutable d6caadd1d5 Added omniauth-auth0 Gem + Applicable Documentation. 2016-03-16 13:12:20 +01:00
Achilleas Pipinellis a34021cd18 Merge branch 'doc-updates' into 'master'
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
2016-03-16 09:59:06 +00:00
Chris Wilson 24ea8d9df4 Use relative link for installation.md 2016-03-15 22:43:11 +00:00
Douwe Maan ecfa6cd75b Merge branch 'master' into git-2-7-3 2016-03-15 23:24:06 +01:00
Douwe Maan 7ae573c75a Bump Git version requirement to 2.7.3 2016-03-15 23:22:05 +01:00
Zeger-Jan van de Weg 59064aeeef Merge branch 'master' into 4009-external-users 2016-03-15 19:16:16 +01:00
Zeger-Jan van de Weg aaf4434b0e Doc external users feature 2016-03-15 18:50:58 +01:00
Jacob Schatz 37707ac59e Merge branch 'css-style-guide' into 'master'
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
2016-03-15 16:52:53 +00:00
Jeroen van Baarsen 0732500595 Merge branch 'patch-1' into 'master'
Fix typo in Ruby CI test and deploy example

[skip ci]

See merge request !3201
2016-03-15 16:13:49 +00:00
Achilleas Pipinellis 090368f6c6 Windows CI support is full since Runner v1.0.0
[ci skip]
2016-03-15 12:46:21 +02:00
Chris Wilson ae090b1c8a Revert to relative requirements.md link use gitlab.com link for installation guides. 2016-03-15 04:12:24 +00:00
connorshea 8d8b457ceb Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add documentation for SCSS Style Guide.
See !3069 for more information.
2016-03-14 20:33:54 -06:00
Robert Speicher c4b35a6230 Merge branch 'fix-commit-status-rendering' into 'master'
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
2016-03-15 00:51:43 +00:00
Douwe Maan ca3fc2296f Merge branch 'gitlab-ci-yaml-updates' into 'master'
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
2016-03-14 20:06:50 +00:00
Achilleas Pipinellis a6f5304280 Merge duplicate cache entry in CI docs
[ci skip]
2016-03-14 19:28:23 +02:00
Dmitriy Zaporozhets d324bf8434 Merge branch 'share-project-ce' into 'master'
Bring from EE: Share Project with Group

- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For #12831 

cc @DouweM @rspeicher @vsizov

See merge request !3186
2016-03-14 16:38:52 +00:00
Robert Speicher d213758a9a Merge branch 'rs-prepare-8-6' into 'master'
Prepare docs for 8.6 RC1

[ci skip]

See merge request !3173
2016-03-14 15:57:20 +00:00
Robert Speicher 1421fa962e Merge branch 'rs-snippet-expires-api' into 'master'
Don't remove `ProjectSnippet#expires_at` from API

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103

This partially reverts commit 836d593033.

See merge request !3144
2016-03-14 15:55:05 +00:00
Robert Speicher d26bd026d9 Update GITLAB_SHELL_VERSION to match EE
[ci skip]
2016-03-14 11:53:42 -04:00
Jasper Denkers 543b85a0f5 Fix typo in Ruby CI test and deploy example 2016-03-14 13:21:31 +00:00
Kamil Trzcinski 0672258915 Cleanup CiCommit and CiBuild
- 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
2016-03-14 13:20:35 +01:00
Achilleas Pipinellis 7ebb932070 Add yaml definition to codeblock
[ci skip]
2016-03-14 10:14:32 +02:00
Dmitriy Zaporozhets e8b3b92dde Bring share project with group API from EE
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-13 11:52:43 +01:00
Achilleas Pipinellis d8eeeb692e Refactor dependencies directive
[ci skip]
2016-03-13 09:57:36 +02:00
Achilleas Pipinellis de7c3316b0 Add hidden jobs 2016-03-13 09:35:40 +02:00