Commit Graph
22224 Commits
Author SHA1 Message Date
Achilleas Pipinellis 9dc91f46df Add link to runners doc [ci skip] 2015-12-08 21:11:27 +02:00
Achilleas Pipinellis 47e81da8c2 Clean up mysql CI example 2015-12-08 21:11:11 +02:00
Drew Blessing 02cc978ebc Merge branch 'ldap_block_when_missing' into 'master'
Block LDAP user when they are no longer found in the LDAP server

Currently, if a user is deleted from LDAP the `Gitlab::Ldap::Access.allowed?` method will return `false`, but the user will not be blocked. This means that the user would be able to continue using GitLab if they are already logged in, or when performing Git over SSH operations.

After this change, users will be blocked when they no longer exist in LDAP. There is still a one hour LDAP check cache time in effect, so the change is not immediate. This is noted in the documentation.

cc/ @DouweM @dzaporozhets 

See merge request !2022
2015-12-08 18:55:20 +00:00
Dmitriy Zaporozhets e99ca657e5 Merge branch 'ui-framework-fixes' 2015-12-08 18:57:43 +01:00
Dmitriy Zaporozhets 7234610010 Merge remote-tracking branch 'origin/ui/misc'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-08 18:50:02 +01:00
Drew Blessing bf5683f889 Block LDAP user when they are no longer found in the LDAP server 2015-12-08 11:15:30 -06:00
Drew Blessing 14165e5972 Merge branch 'update-stats-upon-rake-import' into 'master'
Update project repository size and commit count during import:repos task

Closes #3848

See merge request !2011
2015-12-08 17:12:02 +00:00
Stan Hu 1d410ac96a Update project repository size and commit count during import:repos task
Closes #3848
2015-12-08 09:08:22 -08:00
Dmitriy Zaporozhets 54d0ff982b Merge branch 'build-related-fixes' into 'master'
Build related UI fixes

## Before

![Screen_Shot_2015-12-08_at_13.15.21](/uploads/b72ed55da1f0ec953d2eb077fa4fbb18/Screen_Shot_2015-12-08_at_13.15.21.png)

## After

![Screen_Shot_2015-12-08_at_13.15.01](/uploads/144d8099e2724a51125e392dcbd43ed4/Screen_Shot_2015-12-08_at_13.15.01.png)


See merge request !2015
2015-12-08 17:06:11 +00:00
Dmitriy Zaporozhets 98368d6ec8 Merge branch 'fix-broken-group-avatar-upload' into 'master'
Fix broken group avatar upload

Closes #3918

See merge request !2018
2015-12-08 17:02:50 +00:00
Robert Speicher befff32ecb Merge branch 'languages-graph' into 'master'
Languages graph

See merge request !2009
2015-12-08 16:56:39 +00:00
Dmitriy Zaporozhets 038c9a65fb Merge branch 'ui/dashboard-new-issue' into 'master'
UI: Add "New X" buttons to dashboard and group issue, MR and milestone indexes

# To do

- [x] Use searchable dropdown since dashboard/group can have a lot of projects. Use select2?

## Before

![Screen_Shot_2015-12-07_at_17.26.52](/uploads/22c6d6df10414f9e3e35d6cea3870486/Screen_Shot_2015-12-07_at_17.26.52.png)

## After

![Screen_Shot_2015-12-07_at_17.26.33](/uploads/02d082490ed6c83c66f052a5b601b5be/Screen_Shot_2015-12-07_at_17.26.33.png)

As you can see, for milestones, groups are listed as well as we can now easily create group milestones.

Fixes #3544 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2581

See merge request !1968
2015-12-08 16:43:20 +00:00
Achilleas Pipinellis 06b86de996 Clean up postgres CI example [ci skip] 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 149c934a1d More cleanup on Redis example 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 4236861df0 Clean up Redis CI service example [ci skip] 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 4fc9e6944e Add an intro to CI services documentation [ci skip] 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 545a6a720e Move markdown link to the bottom [ci skip] 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis d13d43aca9 Clean up CI ssh keys docs [ci skip] 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 9b8babb601 Use link instead of connect to be more Docker friendly 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis a08cc70232 Clean up PHP CI example [ci skip] 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis bb75dfe38b Add intro about languages 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 71519d650d Fix wrong example 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 223a027579 Bring back removed heading and point to other section 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 05267b64d2 Clean up using_docker_images.md 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis dcdc49fe42 Use .md instead of .html 2015-12-08 18:25:24 +02:00
Achilleas Pipinellis 91d2457d76 Fix heading 2015-12-08 18:25:24 +02:00
Kamil TrzcinskiandAchilleas Pipinellis 4f074aaa14 Introduce CI documentation for services and languages 2015-12-08 18:25:24 +02:00
Douwe Maan 033947de90 Merge branch 'sync-all-repos' into 'master'
Sync all repos

Scripts and documentation for moving repos, used on gitlab.com.

See merge request !1439
2015-12-08 16:13:59 +00:00
Douwe Maan 7aeb7077cb Only show Edit button for text blobs. 2015-12-08 17:11:23 +01:00
Douwe Maan 82ddd738b6 Show tooltip when trying to edit file when not on branch 2015-12-08 17:10:07 +01:00
Jacob Vosmaer a80f0f66e3 Merge branch 'rake-tasks-git' into 'master'
Added 3  rake tasks for repository maintainance

## What does this MR do?
This MR adds 3 rake tasks

- gitlab:git:repack
  - `-a`
  - `--quiet`
- gitlab:git:gc
  - `--auto`
  - `--quiet`
- gitlab:git:prune
  - Needs git version > 1.8.4.1, Ubuntu repos @ 1.9.x

## Are there points in the code the reviewer needs to double check?
AFAIK this MR abides by the Guidelines for shell commands. Also, the output given is not the diskspace saved etc, just if the commands were succesfull. (Parsing output etc did not seem like the way to go)

Output might be verbose when a lot of repo's are in the system?

## Why was this MR needed?
`git gc` and `git prune` can reduce storage space used.

## What are the relevant issue numbers / Feature requests?
Closes #1529

## Screenshots (if relevant)
`rake -T`
![Screenshot_from_2015-09-22_14-57-59](https://gitlab.com/zj/gitlab-ce/uploads/4abfa00ce7afcc73f553d92581246731/Screenshot_from_2015-09-22_14-57-59.png)
(git fsck now removed as IMHO it doesn't add any value.)

See merge request !1388
2015-12-08 16:05:49 +00:00
Stan Hu 3d654cc0fa Fix broken group avatar upload
Closes #3918
2015-12-08 07:52:08 -08:00
Douwe Maan df6750d3d6 Default target branch to patch-n when editing file in protected branch 2015-12-08 16:42:10 +01:00
Robert Speicher 4cd259e91d Merge branch 'fix-omniauth-signin' into 'master'
Fix signin with OmniAuth providers

OmniAuth CSRF protection was broken with the move to Rails 4.2 since
the CSRF logic in Rails changed. 

This new implementation calls out to Rails instead of copying its code,
which is far easier to maintain.

See merge request !2019
2015-12-08 15:32:24 +00:00
Kelvin d00d3444a4 Remove the prepended v on GitLab Workhorse upgrade doc 2015-12-08 18:23:30 +03:00
Douwe Maan f39ff54290 Merge branch 'master' into zj/gitlab-ce-merge-if-green 2015-12-08 16:18:18 +01:00
Jacob Vosmaer 23f383ef69 Detect project and namespace changes in list:repos 2015-12-08 16:06:06 +01:00
Valery Sizov 792f2bbe0b Merge branch 'bump-gollum-version' into 'master'
Bump gollum-lib to 4.1.0 and fix dependency mismatch with rouge

Closes #3767

See merge request !2017
2015-12-08 14:53:05 +00:00
Douwe Maan 15925290ee Merge branch 'master' into ui/dashboard-new-issue 2015-12-08 15:22:04 +01:00
Douwe Maan 51ed5225ad Merge branch 'serve_lfs_object' into 'master'
Serve LFS object

Depends on gitlab-org/gitlab_git!57

See merge request !1976
2015-12-08 14:19:52 +00:00
Jacob Vosmaer f3ca92a062 Add 'resume' capability to parallel-rsync-repos 2015-12-08 15:08:22 +01:00
Douwe Maan 41a4785b85 Fix signin with OmniAuth providers 2015-12-08 14:58:15 +01:00
Douwe Maan 5beacba038 Fix spec 2015-12-08 14:14:04 +01:00
Douwe Maan ab85d9694d Fix spec 2015-12-08 14:13:03 +01:00
Douwe Maan b2b548de9d Rewrite docs 2015-12-08 14:02:34 +01:00
Marin Jankovski 6245be083d All for you rubocop. 2015-12-08 14:00:15 +01:00
Douwe Maan 75486f09c4 Merge branch 'master' into zj/gitlab-ce-merge-if-green 2015-12-08 13:43:45 +01:00
Stan Hu f36fe92fcb Bump gollum-lib to 4.1.0 and fix dependency mismatch with rouge
Closes #3767
2015-12-08 04:43:17 -08:00
Douwe Maan 926c3bef9f Merge branch 'master' into reference-pipeline-and-caching 2015-12-08 13:40:32 +01:00
Douwe Maan 1a10945066 Fix RedactorFilter 2015-12-08 13:40:23 +01:00