Commit Graph
22224 Commits
Author SHA1 Message Date
Douwe Maan 317206300d Merge branch 'configurable-attachment-size' into 'master'
Support configurable attachment size in Application Settings page

### What does this MR do?

This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page.

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

What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid.

### Why was this MR needed?

We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

See Issue #1258

### Screenshots

Before:

![Screen_Shot_2015-03-29_at_3.06.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6013a1dbc8cf61a63e93744149937fa0/Screen_Shot_2015-03-29_at_3.06.53_PM.png)

After:

![Screen_Shot_2015-03-29_at_3.12.34_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f3518af7e8653ba40f0a3579456da6ad/Screen_Shot_2015-03-29_at_3.12.34_PM.png)

See merge request !407
2015-04-03 08:47:55 +00:00
Cristian Medina f045490568 Modified lib/api/entities.rb to expose Project class tag_list property to the API
Updated projects.md to show tag_list field when performing GETs
Updated projects_spec.rb to include check for tag_list key in project list
Added changes to the CHANGELOG
2015-04-03 04:35:12 -04:00
Douwe Maan c5d7660000 Fix errors. 2015-04-02 22:36:54 +02:00
Dmitriy Zaporozhets 0d0042d274 Merge branch 'import-current-user' into 'master'
Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace.

Addresses #1347.

Untested since I'm in a bit of a hurry. Will definitely have time to test and add unit tests before the 7.10 release :)

See merge request !481
2015-04-02 20:34:52 +00:00
Dmitriy Zaporozhets 424cbf46d5 Merge branch 'repository-archive-worker' into 'master'
Archive repositories in background worker.

Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/17 being merged, a new `gitlab_git` being released and this MR's `Gemfile.lock` being updated..

See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2173.

To do after this is merged: Update https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb in omnibus.

See merge request !436
2015-04-02 20:30:55 +00:00
Dmitriy Zaporozhets f8f9750323 Merge branch 'username-period' into 'master'
Don't allow username to end in period.

The current behavior doesn't do username referencing and mentioning in sentences like "I discussed with with @douwe." since `douwe.` is matched as a username.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2174.

See merge request !438
2015-04-02 20:28:23 +00:00
Dmitriy Zaporozhets 24b048db59 Merge branch 'backup_skip_option' into 'master'
Ability to skip some items in backup

https://dev.gitlab.org/gitlab/gitlabhq/issues/1936

Now it is possible to run

```
sudo gitlab-rake gitlab:backup:create SKIP=repositories,uploads
```

available options: repositories,uploads,db

See merge request !470
2015-04-02 20:21:44 +00:00
Stan Hu b277f23a53 Improve regexp to prevent false positives
If a filename happened to contain "db" and enough "rwx" characters before, then
this test would previously fail. For example:

```
drwxr-xr-x gitlab-runner/gitlab-runner      0 2015-04-02 07:46 uploads/tmp/cassidy.stokes8477/gitlabhq/36d972fa55d6b44810fc6fd843473adb/
```

Adding a space before the "db" match string tightens up the regexp and reduces the
chance of unintended match.
2015-04-02 07:02:47 -07:00
Valery Sizov 67c83489ca ability to skip some items in backup 2015-04-02 15:37:50 +03:00
Douwe Maan 8361ba81ab Add changelog item. 2015-04-02 10:57:02 +02:00
Douwe Maan 65bb0c3406 Only allow users to cross-reference and close issues they have access to. 2015-04-02 10:57:01 +02:00
Douwe Maan e62b5a2b07 Only allow user to see participants from groups they have access to. 2015-04-02 10:57:01 +02:00
Douwe Maan 756e7aa8c3 Don't allow full access to guests in ReferenceExtractor 2015-04-02 10:57:01 +02:00
Douwe Maan d9698628d9 Add Commit#author and #committer. 2015-04-02 10:57:01 +02:00
Douwe Maan 403b727138 Slightly refactor getting note notification recipients. 2015-04-02 10:57:01 +02:00
Douwe Maan d2bd606759 Refactor Mentionable mentioned users to use ReferenceExtractor. 2015-04-02 10:57:01 +02:00
Douwe Maan ca58e369c9 Only allow user to reference objects they have access to. 2015-04-02 10:56:04 +02:00
Douwe Maan b1ef1aa59f Slightly refactor ReferenceExtractor. 2015-04-02 10:53:38 +02:00
Douwe Maan 2a0d38c03f Merge branch 'rs-icon-symlink' into 'master'
Check symlink mode as a String for file_type_icon_class

The file mode for a symlink just got changed in `gitlab_git`, see https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69

See merge request !487
2015-04-02 08:09:02 +00:00
Stan Hu dfd256f29e Support configurable attachment size via Application Settings
Fix bug where error messages from Dropzone would not be displayed on the issues page

Closes #1258
2015-04-02 00:04:08 -07:00
Robert Speicher 6ab8275cd1 Check symlink mode as a String for file_type_icon_class
See https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69
2015-04-01 23:34:33 -04:00
Marin Jankovski 254698d6b8 Update CHANGELOG. 2015-04-02 05:06:07 +02:00
Marin Jankovski 897fb55c78 Update changelog for 7.9.2. 2015-04-02 05:04:13 +02:00
Dominik Sander eaf919ec7d Fix event-title max-width in the dashboard
For view port sizes between 1260px and 1200px pixels the event-title was
too wide, thus not truncated and got pushed into a second line.

100% - 174px was chosen as the max-width because 141px is the widest
.event-item-timestamp can get (with 'less than a minute ago') + 24px for
the avatar + 8px avatar margin + 1px to fit into the gap.
2015-04-02 00:01:08 +02:00
Sullivan SENECHAL 15fc957163 Bootlint integration 2015-04-01 21:33:22 +02:00
Douwe Maan d92e4ccc6e Add tests. 2015-04-01 17:17:18 +02:00
Douwe Maan 85b29f99f0 Make sure Sidekiq picks up archive_repo queue in production. 2015-04-01 14:36:17 +02:00
Marin Jankovski 16a6ea2d17 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-03-31 19:04:52 -07:00
Marin Jankovski d77f333f9c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Conflicts:
	lib/gitlab/markdown.rb
2015-03-31 19:03:54 -07:00
Marin Jankovski 96d093e59a Merge branch 'email-full-url' 2015-03-31 19:00:59 -07:00
Dmitriy Zaporozhets c14c03a88f Merge branch 'rs-issue-1340' into 'master'
Unbind task item checkbox events and then rebind them

Fixes #1340

This issue was caused by this line: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/views/projects/issues/update.js.haml#L17

`new Issue()` gets called on every JS-based issue update, and all the binds in the constructor get re-applied without first unbinding the existing ones. Right now my fix is *only* for the checkbox events, and I suspect there are similar issues still present for other events.

See merge request !478
2015-04-01 01:33:03 +00:00
Dmitriy Zaporozhets 7ed8b76f64 Merge branch 'no-chmod-r' into 'master'
Don't use chmod_R for backup tars

When creating backup tar files, only change permissions on the `db`, `uploads`, and `repositories` directories, not their contents.  See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1716#note_40472

See merge request !1744
2015-04-01 01:10:00 +00:00
Dmitriy Zaporozhets dc3b4321ff Merge branch 'group-information-leak' into 'master'
Don't leak private group existence by redirecting from namespace controller to group controller.

See merge request !440
2015-04-01 01:01:38 +00:00
Dmitriy Zaporozhets 0622b87537 Merge branch 'admin-user-projects' into 'master'
Fix admin user projects lists.

The admin user personal projects lists wasn't being rendered anymore.

cc @marin

See merge request !442
2015-04-01 00:44:09 +00:00
Dmitriy Zaporozhets a9af64855d Merge branch 'refactor-milestones' into 'master'
Better looking milestone lists

### Before

![milestone-before](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1366ade74d76b067fdc8707d31d2bffc/milestone-before.png)

### After

![milestone-after](https://gitlab.com/gitlab-org/gitlab-ce/uploads/80ae1c1f77eae5dff8ee61c4271bec17/milestone-after.png)

See merge request !484
2015-04-01 00:37:39 +00:00
Dmitriy Zaporozhets d71fbe713b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-01 02:48:54 +03:00
Dmitriy Zaporozhets 6a790b7963 Better looking milestone lists 2015-04-01 02:45:47 +03:00
Robert Speicher 085f12288d Unbind task item checkbox events and then rebind them
Fixes #1340
2015-03-31 17:45:11 -04:00
Douwe Maan 45ee9009f5 Fix migration SQL. 2015-03-31 23:42:49 +02:00
Phil Hughes 6fe26e3e46 Removed help link from sidebar 2015-03-31 17:49:19 +01:00
Robert SchillingandJakub Jirutka 9769c2d7fd Fix #6417: users with group permission should be able to create groups via API 2015-03-31 18:32:24 +02:00
Dmitriy Zaporozhets eb2339a401 Merge pull request #9023 from dantudor/patch-1
Allow ability to delete branches with '/` in name
2015-03-31 19:30:15 +03:00
Dan Tudor a6c6335671 Added the missing comma 2015-03-31 17:08:33 +01:00
Douwe Maan 737f322e41 Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace. 2015-03-31 16:34:13 +02:00
Douwe Maan cef0fe244f Update gitlab_git to 7.1.6 because 7.1.5 had broken language detection. 2015-03-31 14:17:20 +02:00
Douwe Maan 91761b0685 Add tests. 2015-03-31 13:37:21 +02:00
Douwe Maan 2fdae52fd1 Add item to changelog. 2015-03-31 12:53:23 +02:00
Douwe Maan ccc01b36ba Small code cleanup. 2015-03-31 12:52:20 +02:00
Douwe Maan e7bbd85b34 Limit number of concurrent archive_repo jobs to 2. 2015-03-31 12:52:20 +02:00
Douwe Maan 2cfd0b59ae Archive repositories in background worker. 2015-03-31 12:52:20 +02:00