Commit Graph
15362 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 041ce7b303 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-08 14:09:58 +03:00
Dmitriy Zaporozhets 49ca05f4de Merge branch 'rs-shortcuts-typo' into 'master'
Typo -- findAndollowLink -> findAndFollowLink

Pushed here to get working CI.

See merge request !1750
2015-04-08 11:08:30 +00:00
Jeroen van Baarsen 4cf25eea3a Merge pull request #8546 from h0ru5/patch-1
add necessary dir for uploads in update to 6.7
2015-04-08 10:07:17 +02:00
Patricio Cano 3769e41ad8 Corrected title of forking workflow 2015-04-07 19:37:56 -05:00
Sytse Sijbrandij 4b2aa9cd20 Merge branch 'forking-doc' into 'master'
Documentation on how to fork a project

Added documentation on how to fork a project.

/cc @sabba

See merge request !1623
2015-04-08 00:34:32 +00:00
Patricio Cano a332e7bd02 Implemented changes suggested by Job. 2015-04-07 19:27:04 -05:00
Patricio Cano 45c82b3845 Added 7.9.3 to CHANGELOG 2015-04-07 13:18:37 -05:00
Robert Speicher f7190e428f Typo -- findAndollowLink -> findAndFollowLink 2015-04-07 11:03:48 -04:00
Dmitriy Zaporozhets 7d57d8b783 Merge branch 'rs-issue-2088' into 'master'
Lower the pointHitDetectionRadius for commit charts

Needed to update the Chart.js dependency as well.

Fixes #2088

See merge request !1749
2015-04-07 10:07:52 +00:00
Robert Speicher 5cc11cfcab Lower the pointHitDetectionRadius for commit charts
Fixes #2088
2015-04-07 00:37:05 -04:00
Robert Speicher 26a6cec90b Update Chart.js 2015-04-07 00:37:05 -04:00
Dmitriy Zaporozhets 526b28daa3 Merge pull request #9091 from bbodenmiller/patch-1
remove extra scrollbar on background jobs tab
2015-04-06 08:47:18 +03:00
Ben Bodenmiller af4577d779 remove extra scrollbar on background jobs 2015-04-04 05:46:18 -07:00
Douwe Maan 45ca39e81b Merge remote-tracking branch 'github.com/master' 2015-04-04 14:23:32 +02:00
Douwe Maan 124e7d5efc Merge branch 'no-limit-fetch' into 'master'
Remove sidekiq-limit_fetch because it require Redis 2.6.

See merge request !491
2015-04-04 12:19:51 +00:00
Drew Blessing c12ce22a72 Merge branch 'update-changelog-for-mr214' into 'master'
Updated CHANGELOG for !214

Forgot to update the CHANGELOG for !214. Prompted by @dblessing to submit this MR to fix that.

See merge request !493
2015-04-03 21:13:05 +00:00
Jeremy Maziarz ee9b427f43 Updated CHANGELOG for MR 214 2015-04-03 16:38:19 -04:00
Douwe Maan bc2edc359d Remove sidekiq-limit_fetch because it require Redis 2.6. 2015-04-03 18:38:31 +02:00
Douwe Maan 04a42ce3f1 Merge branch 'custom-email-reply-to' into 'master'
Add ability to configure Reply-To address

### What does this MR do?

This MR adds configuration variable `email_reply_to` to make it possible to configure a custom Reply-To address other than the default `noreply@mydomain.com`.

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

#1305

See merge request !455
2015-04-03 15:14:04 +00:00
Drew Blessing aaacef47ff Merge branch 'fix-admin-project-urls' into 'master'
Link paths for http and ssh in the admin project show view are incorrect

The link paths for http and ssh in the admin project show view are incorrect. Clicking on them effectively reloads the page. I think the intent is to have the links point to the project dashboard.

Incorrect: http://gitlab.example.com/admin/projects/[namespace]/[project]
Correct: http://gitlab.example.com/[namespace]/[project]

See merge request !214
2015-04-03 15:09:30 +00:00
Stan Hu 81a5a9713d Add ability to configure Reply-To address in gitlab.yml
Closes #1305
2015-04-03 06:47:54 -07:00
Drew Blessing aedc12547a Merge branch 'issue-sidebar-size' into 'master'
Changes the width of sidebar in issues and MRs when affix event fires

Fixes #1320

Width is set when Bootstraps affix event is fired and then removed when it reaches the top or bottom.

See merge request !464
2015-04-03 13:23:11 +00:00
Hannes Rosenögger 965b92a725 Merge branch 'feature_expose_project_labels' into 'master'
Exposing Project Labels in the REST API

The intent here is to expose the tag_list property of the Project entity over the REST API so that any project searches include the information. The specific reason I've implemented this change is for an environment in which multiple gitlab servers exist, where a central portal to the projects that are spread around the network will be useful. Having access to filtering on this fairly large project list based on their labels, will be of great use.

This satisfies the feature request http://feedback.gitlab.com/forums/176466-general/suggestions/6325819-project-labels-via-api

The change was made in the `lib/api/entities.rb` file.

The output of a `GET` to something like `/projects` or `/projects/7` is now:
```javascript
{
  "id": 7,
  "description": "Veritatis est eaque voluptas magni expedita.",
  "default_branch": "master",
  **"tag_list": [
    "typeahead",
    "twitter"
  ],**
  "public": false,
  "archived": false,
  "visibility_level": 0,
  ...
}
```

See merge request !329
2015-04-03 13:18:55 +00:00
Jeroen van Baarsen 9925051ece Merge pull request #7982 from Soullivaneuh/help-images
Fix and improve help rendering
2015-04-03 12:19:12 +02:00
Sullivan SENECHALandSullivan SENECHAL d365004e68 Fix and improve help rendering 2015-04-03 11:56:50 +02:00
Douwe Maan 9157985cfc Merge branch 'fix-backup-spec-regexp' into 'master'
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 an unintended match.

See merge request !489
2015-04-03 08:49:47 +00:00
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
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 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
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