Commit Graph
21202 Commits
Author SHA1 Message Date
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
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
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
Marin Jankovski 6245be083d All for you rubocop. 2015-12-08 14:00:15 +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 0c3f70acf4 Add API group projects specs 2015-12-08 13:34:09 +01:00
Marin Jankovski ea5b462a14 Stub the calls to disk and check what send_file returns. 2015-12-08 13:33:12 +01:00
Jacob Vosmaer 6d2be0212c Merge branch 'master' into sync-all-repos 2015-12-08 12:35:54 +01:00
Marin Jankovski 9bf51ae47d Fix specs caused by update of gitlab-test repo. 2015-12-08 10:58:15 +01:00
Douwe Maan f5430e48b4 Merge branch 'rs-validators' into 'master'
Add more custom validators

These custom validators allow us to DRY up our models a bit.

See merge request !1944
2015-12-08 08:42:17 +00:00
Douwe Maan 1d605f6365 Merge branch 'fix-merge-request-that-removes-submodule' into 'master'
Fix 500 error when creating a merge request that removes a submodule

Fixes #3476 

See merge request !1989
2015-12-08 08:36:23 +00:00
Valery Sizov 7f90c8efcc Merge branch 'gemfile_fix' into 'master'
Add explicit reference to rouge 1.10.1

We are relying on rouge 1.10.1 but nothing is referencing to this version and it is easy to lose this dependence. Previously, it was updated directly in Gemfile.lock which is not reliable way :)

https://gitlab.com/gitlab-org/gitlab-ce/commit/e20529cec4f6de0c2c1589da99abb8714ea1c1c1

`gollum-lib` has a dependence `rouge 1.9` which is old for us.

See merge request !1937
2015-12-08 07:49:07 +00:00
Valery Sizov 2e270c0705 add explicit reference to rouge 1.10.1 2015-12-08 09:05:02 +02:00
Dmitriy Zaporozhets 9b20731d4a Add tests and changelog item for language graphs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-08 02:38:59 +01:00
Dmitriy Zaporozhets 9b561e7e15 Implement languages graph page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-08 02:35:34 +01:00
Douglas Barbosa Alexandre f7aafd8fc8 Merge branch 'master' into fix-merge-request-that-removes-submodule 2015-12-07 22:41:18 -02:00
Dmitriy Zaporozhets e02940e329 Merge branch 'fix-random-test' into 'master'
Fix random failing test - delete attachment

Make sure we wait for AJAX request to finish before end test and cleanup
database

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

cc @rspeicher @DouweM 

Fixes #3885 

See merge request !2007
2015-12-08 00:02:40 +00:00
Dmitriy Zaporozhets bdb4945dcf Fix random failing test - delete attachment
Make sure we wait for AJAX request to finish before end test and cleanup
database

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-07 23:40:17 +01:00
Robert Speicher 2379c8beea Inline Gitlab::Blacklist in NamespaceValidator 2015-12-07 16:57:26 -05:00
Robert Speicher 175f482c3c Add custom NamespaceNameValidator 2015-12-07 16:57:26 -05:00
Robert Speicher 9321d382bd Add custom NamespaceValidator 2015-12-07 16:57:26 -05:00
Robert Speicher ad6a771dc6 Add custom LineCodeValidator 2015-12-07 16:57:26 -05:00
Robert Speicher 96e51a0304 Minor EmailValidator refactor 2015-12-07 16:57:26 -05:00
Robert Speicher e48391b813 Add custom ColorValidator 2015-12-07 16:57:26 -05:00
Robert Speicher b3200c8c44 Move EmailValidator to app/validators 2015-12-07 16:57:26 -05:00
Robert Speicher d5ea93469b Add custom UrlValidator 2015-12-07 16:57:26 -05:00
Robert Speicher 2928e19d43 Merge branch 'rs-spec-failure' into 'master'
Fix spec failure introduced by 9d03bc6fa3

See merge request !2006
2015-12-07 21:52:47 +00:00
Robert Speicher a1d3b8d7fa Fix spec failure introduced by 9d03bc6fa3 2015-12-07 16:50:20 -05:00
Dmitriy Zaporozhets 24ab860554 Merge branch 'fix-random-failing-test' into 'master'
Fix random failing test

Make sure we wait till page reloads after request was merged. Otherwise
we get request running which fails next test

Improvement for !1897

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

See merge request !2004
2015-12-07 20:55:22 +00:00
Robert Speicher 9d03bc6fa3 Merge branch 'pberndt:master' into 'master'
Fix #3758: Serious performance issues due to timeago()
being called n*(n+1)/2 times instead of n

See bug #3758 for a description. This merge request alters 
`time_ago_with_tooltip` to invoke the `timeago()` javascript on the
current timestamp only, instead of each one defined on the page so far.

See merge request !1977
2015-12-07 20:01:39 +00:00
Dmitriy Zaporozhets 2e074500b2 Merge branch 'fix-parallel-merge' into 'master'
Dont use cached collection for Repository find_branch and find_tag methods

Fix for #3816 

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

See merge request !2003
2015-12-07 19:53:30 +00:00
Dmitriy Zaporozhets 949a7e8e20 Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ce 2015-12-07 20:17:29 +01:00
Dmitriy Zaporozhets 74d73bd953 Fix random failing test
Make sure we wait till page reloads after request was merged. Otherwise
we get request running which fails next test

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-07 20:09:30 +01:00
Dmitriy Zaporozhets c823e85d15 Merge branch 'add_assign_to_me' into 'master'
Filter current user to top of assignee list in issues/merge requests

### What does this MR do?

Fixes #2076

Filter the current user to the top of the assignee list in issues and merge requests. This makes it fast/easy for a user to assign themselves without compromising the UI. This is the same thing we do in the filter select boxes in other places.

### Are there points in the code the reviewer needs to double check?

No.

### Why was this MR needed?

Users requested the feature in #2076



See merge request !1493
2015-12-07 19:00:40 +00: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
Dmitriy Zaporozhets 815cec3ea7 Merge branch 'minimize-readme' into 'master'
Move release cycle comments to the documentation.



See merge request !1995
2015-12-07 18:55:27 +00:00
Dmitriy Zaporozhets 1da71fa9ed Merge branch 'feature/sidekiq-cron' into 'master'
Migrate from Sidetiq to Sidekiq-cron

Migrate from Sidetiq to Sidekiq-cron
Updated Sidekiq to 3.5.x

This will solve #2355

See merge request !1982
2015-12-07 18:53:59 +00:00
Dmitriy Zaporozhets 2cec90254f Dont use cached collection for Repository find_branch and find_tag methods
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-07 19:37:05 +01:00
Douwe Maan 6fb90a2ca3 Include groups in dashboard "New Milestone" select. 2015-12-07 17:24:15 +01:00
Kamil Trzciński 24c7eafb29 Merge branch 'fix-docker-syntax' into 'master'
Update Docker Syntax

I think this documentation is using an out-of-date docker client. I guess that `-n` means `--name` (there is no `-n` in up-to-date docker) and `-l` means `--link` (`-l` is short for `--label` now).

See merge request !2001
2015-12-07 16:21:56 +00:00
Douwe Maan 5a9a8d03a7 Merge branch 'master' into ui/dashboard-new-issue 2015-12-07 17:12:29 +01:00
Douwe Maan cbcb8dbe70 Use select2 dropdown for dashboard/group 'New X' buttons 2015-12-07 17:12:04 +01:00