Commit Graph

3077 Commits

Author SHA1 Message Date
Douwe Maan 50f8366a89 Merge branch 'complexity/rubocop-metrics' into 'master'
Enable rubocop metrics

This enables rubocop metrics like CyclomaticComplexity and ABCSize.
Initial threshold values are high, should be probably decreased.

See merge request !1802
2015-12-11 15:06:31 +00:00
Grzegorz Bizon cbeb06eb42 Mix url helpers in into `RepositoryPush` 2015-12-11 13:00:24 +00:00
Valery Sizov 72b7d1f59d emoji aliases problem 2015-12-11 13:17:12 +02:00
Corey Hinshaw d8b3c3274c AuthHash should not parameterize email user 2015-12-10 18:49:48 -05:00
Douwe Maan 10387f6b8a Merge branch 'master' into tmp-reference-pipeline-and-caching
# Conflicts:
#	spec/lib/gitlab/markdown/autolink_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/cross_project_reference_spec.rb
#	spec/lib/gitlab/markdown/emoji_filter_spec.rb
#	spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/external_link_filter_spec.rb
#	spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/label_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/redactor_filter_spec.rb
#	spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
#	spec/lib/gitlab/markdown/relative_link_filter_spec.rb
#	spec/lib/gitlab/markdown/sanitization_filter_spec.rb
#	spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
#	spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
#	spec/lib/gitlab/markdown/task_list_filter_spec.rb
#	spec/lib/gitlab/markdown/upload_link_filter_spec.rb
#	spec/lib/gitlab/markdown/user_reference_filter_spec.rb
2015-12-10 14:04:34 +01:00
Kamil Trzciński b4b9df277b Allow [Symbol] when loading YAML 2015-12-09 20:58:53 +00:00
Kamil Trzciński c5dacce4d7 Use YAML.safe_load 2015-12-09 19:50:00 +00:00
Douwe Maan 73c59de062 Merge branch 'master' into split-up-builds 2015-12-09 13:56:26 +01:00
Douwe Maan 6c6fb1d8bb Split up spec:other even more 2015-12-09 11:56:23 +01:00
Douwe Maan 7a5e77c0a0 Fix rspec tag syntax 2015-12-09 11:09:25 +01:00
Douwe Maan ae0b901731 Split up specs more 2015-12-09 10:51:01 +01:00
Douwe Maan 9ebdee0967 Split up feature specs more 2015-12-09 10:50:43 +01:00
Douwe Maan eab086bde1 Merge branch 'master' into merge-if-green
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb
2015-12-09 09:00:25 +01:00
Douwe Maan 8fb49a4b70 Merge branch 'master' into merge-if-green
# Conflicts:
#	app/views/projects/merge_requests/widget/_heading.html.haml
#	app/views/projects/merge_requests/widget/open/_accept.html.haml
2015-12-08 22:34:03 +01:00
Douwe Maan 23b6a98de0 Move Builds tab to the end 2015-12-08 22:28:28 +01:00
Douwe Maan 6c94a44295 Merge branch 'master' into mr-builds
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/views/projects/merge_requests/widget/_heading.html.haml
2015-12-08 22:26:29 +01:00
Robert Speicher bcd89a58e7 Merge branch 'reference-pipeline-and-caching' into 'master'
Implement different Markdown rendering pipelines and cache Markdown

Builds on !1090. 

Related to !1014.

Fixes #2054.

See merge request !1602
2015-12-08 20:22:23 +00: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
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 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
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
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
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
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
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
Douwe Maan 41a4785b85 Fix signin with OmniAuth providers 2015-12-08 14:58:15 +01:00
Douwe Maan 75486f09c4 Merge branch 'master' into zj/gitlab-ce-merge-if-green 2015-12-08 13:43:45 +01: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
Douwe Maan af6b543742 Make commit and MR ref filters aware of /builds path 2015-12-08 13:22:20 +01:00
Jacob Vosmaer 6d2be0212c Merge branch 'master' into sync-all-repos 2015-12-08 12:35:54 +01:00
Douwe Maan 13f44822d9 Move CombinedPipeline methods around 2015-12-08 12:29:48 +01:00
Grzegorz Bizon 652de0b820 Refactor CI YAML processor's validators 2015-12-08 08:43:09 +01:00
Grzegorz Bizon 66f658a9b5 Check if commits are available in `RepositoryPush` 2015-12-08 08:43:09 +01:00
Grzegorz Bizon 591035968d Duplicate options in `RepositoryPush` 2015-12-08 08:43:09 +01:00
Grzegorz Bizon 75c6b29f6b Add `RepositoryPush` specs 2015-12-08 08:43:09 +01:00
Grzegorz Bizon d835fbc79f Fix url helpers in RepositoryPush 2015-12-08 08:43:09 +01:00
Grzegorz Bizon 9f2752e5dc Remove obsolete variables in `repository_push_email` 2015-12-08 08:43:08 +01:00
Grzegorz Bizon 4beba7494b Improve Messagee::RepositoryPush 2015-12-08 08:43:08 +01:00
Grzegorz Bizon e2f937ce22 Refactor RepositoryPush, move to Message namespace 2015-12-08 08:43:08 +01:00
Grzegorz Bizon 8c6db54e12 Extract repository_push_email to separate class 2015-12-08 08:43:08 +01:00
Robert Speicher 611912fe68 Store the demodulized reference filter name in data attribute 2015-12-07 19:40:46 -05:00
Robert Speicher 2379c8beea Inline Gitlab::Blacklist in NamespaceValidator 2015-12-07 16:57:26 -05:00
Robert Speicher b3200c8c44 Move EmailValidator to app/validators 2015-12-07 16:57:26 -05:00
Dmitriy Zaporozhets 168b3e973f Merge branch 'fix-api-private-project-update' into 'master'
Fix API setting of 'public' attribute to false will make a project private

There is a bug in the projects API where setting `public` to `false` of  would not change `visibility_level` even if `visiblity_level` were not present.

Closes #3864

See merge request !1996
2015-12-07 18:56:40 +00:00
Douwe Maan 5a9a8d03a7 Merge branch 'master' into ui/dashboard-new-issue 2015-12-07 17:12:29 +01:00
Douwe Maan 8f817c7b08 Add API group projects endpoint. 2015-12-07 17:10:40 +01:00
Valery Sizov bd5fb1b479 Merge branch 'webhook_payload_with_changes' into 'master'
Add added, modified and removed properties to commit object in webhook

https://gitlab.com/gitlab-org/gitlab-ee/issues/20

See merge request !1988
2015-12-07 14:43:13 +00:00