Commit Graph
3235 Commits
Author SHA1 Message Date
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658
# 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
2016-03-21 23:22:21 +01:00
Zeger-Jan van de Weg 6e5461c6ee Merge branch 'master' into 2489-soft-delete-issues 2016-03-21 19:32:37 +01:00
Zeger-Jan van de Weg d28a587e82 Fix typos and denting 2016-03-21 19:30:45 +01:00
Zeger-Jan van de Weg 3b088fc5b5 Minor improvements on IssuableActions 2016-03-21 16:59:35 +01:00
Jacob Vosmaer 016c6da7c6 Gitlab-workhorse tags have "v" now 2016-03-21 13:13:34 +01:00
Jacob Vosmaer 3d750563d2 Use gitlab-workhorse 0.7.1 2016-03-21 13:09:23 +01:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
Zeger-Jan van de Weg 7342a4566c Dry destroy action on issuables 2016-03-19 21:24:05 +01:00
Zeger-Jan van de Weg 212e83bab3 Soft delete issuables 2016-03-19 21:23:03 +01:00
Achilleas Pipinellis 4f0302f00e 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-19 08:27:05 +00:00
Achilleas Pipinellis e1ce7a47fa Add note in rest of update guides
[ci skip]
2016-03-18 14:35:04 +02:00
Achilleas Pipinellis 4d3e8ceea5 Merge branch 'master' into docs_select_version_to_install 2016-03-18 14:31:33 +02:00
Pat Turner 280d9dc23f fixed md anchor link 2016-03-18 11:46:19 +00:00
Pat Turner 44ca0305cd Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366 2016-03-18 08:32:56 +00:00
Achilleas Pipinellis 8edb133f7b 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 07:44:47 +00:00
Sytse Sijbrandij 4eb9711b46 Remove CI duplication. 2016-03-17 21:52:34 -07:00
Douwe Maan 515dd63d65 Bump Git version requirement to 2.7.4 2016-03-17 22:21:10 +01:00
Pat Turner 08ed12d91e removed anchor as unsupported in markdown 2016-03-17 17:27:13 +00:00
Pat Turner 0ce1f9387a Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366 2016-03-17 15:28:55 +00: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
Anatoly Borodin 6c06b65d1e 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

[ci skip]

Signed-off-by: Anatoly Borodin <anatoly.borodin@gmail.com>
2016-03-17 00:35:53 +01: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