Commit Graph
15386 Commits
Author SHA1 Message Date
Christoph Dreis 1fdc610fa5 Include creator_id in project info of API 2015-04-10 18:35:05 +02:00
Douwe Maan f3f856029b Merge branch 'fix-slashes-in-wiki-urls' into 'master'
Fix bug where Wiki pages that include a '/' were no longer accessible

### What does this MR do?

This MR fixes a regression that caused Wiki pages that included a '/' to no longer be accessible.

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

Are there cases that `wiki_helper.rb` doesn't handle?

### Why was this MR needed?

The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76e) caused slashes in a model ID to be escaped automatically. We can no longer use the built-in the URL helpers to generate the links for Wiki pages if we want to maintain support for slashes. There is no option to tell the formatter otherwise:

http://stackoverflow.com/questions/25031791/rails-4-1-2-to-param-escapes-slashes-and-breaks-app

The Rails code in question is here:

https://github.com/rails/rails/blob/4-1-stable/actionpack/lib/action_dispatch/journey/visitors.rb#L159

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

#1363

See merge request !502
2015-04-08 16:30:23 +00:00
Dmitriy Zaporozhets a381ecbdbc Merge branch 'project-file-tabs' into 'master'
Move project file links to tab bar.

The sidebar was getting awfully crowded, so I moved the file links to the tab bar alongside Activity and Readme. Unlike Readme, these files are not actually loaded in a tab, but simply link to the relevant blob, because we don't want to unnecessarily load the potentially large changelog or contribution guide on every project page load.

![Screen_Shot_2015-04-06_at_15.04.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/962e8073ab6dc8797f93ee754eb275ed/Screen_Shot_2015-04-06_at_15.04.21.png)

See merge request !497
2015-04-08 13:10:52 +00:00
Dmitriy Zaporozhets e86e101370 Merge branch 'bump_all_versions' into 'master'
Corrected steps for creating a patch release

Added step to bump all versions (CE, EE, CI) every time there is a patch release and the reasoning behind it

See merge request !1754
2015-04-08 11:16:44 +00:00
Dmitriy Zaporozhets a4ff127728 Merge branch 'rs-application-form-messages' into 'master'
Make the "New Application" form's error messages visible

Prior, if you submit the form without values the error text and the form fields were white-on-white:

![Screen_Shot_2015-04-01_at_8.25.56_PM](https://dev.gitlab.org/gitlab/gitlabhq/uploads/17eb44e65fc9c5ddd4a529e3927cd9b6/Screen_Shot_2015-04-01_at_8.25.56_PM.png)

After:

![Screen_Shot_2015-04-06_at_10.13.07_PM](https://dev.gitlab.org/gitlab/gitlabhq/uploads/be53d6971ec1c34f415e75a0307b6577/Screen_Shot_2015-04-06_at_10.13.07_PM.png)

See merge request !1752
2015-04-08 11:14:08 +00:00
Dmitriy Zaporozhets 4902dca966 Merge branch 'rs-issue-2152' into 'master'
Render a 404 when RefsController#logs_tree gets an HTML request

Fixes #2152

See merge request !1748
2015-04-08 11:11:38 +00:00
Dmitriy Zaporozhets 584fa0bdca Merge branch 'rs-signup-box-text' into 'master'
Improve wording below signup box

Before:

![Screen_Shot_2015-04-07_at_5.46.31_PM](https://dev.gitlab.org/gitlab/gitlabhq/uploads/a5433c7c423fd37cffe4c2352a833dcf/Screen_Shot_2015-04-07_at_5.46.31_PM.png)

After:

![Screen_Shot_2015-04-07_at_5.45.05_PM](https://dev.gitlab.org/gitlab/gitlabhq/uploads/46e13756a8dc389e6f87de0097433e36/Screen_Shot_2015-04-07_at_5.45.05_PM.png)

See merge request !1755
2015-04-08 11:10:41 +00:00
Dmitriy Zaporozhets 7b00721bb9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-08 14:10:08 +03:00
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
Robert Speicher 8714038410 Improve wording below signup box
[ci skip]
2015-04-07 17:46:00 -04:00
Patricio Cano 56a19b8043 Added step to bump all versions (CE, EE, CI) every time there is a patch release and the reasoning behind it 2015-04-07 15:24:15 -05:00
Patricio Cano 45c82b3845 Added 7.9.3 to CHANGELOG 2015-04-07 13:18:37 -05:00
Robert Speicher b9069f31b9 Make the New Application form's error messages visible 2015-04-07 13:01:30 -04:00
Stan Hu 3143edfea6 Fix bug where Wiki pages that include a '/' were no longer accessible
Closes #1363
2015-04-07 09:10:11 -07: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
Dmitriy Zaporozhets 7feec5fe05 Merge branch 'add-menu-icons' into 'master'
Add icons to Add dropdown items.

Before:

![Screen_Shot_2015-04-06_at_15.15.44](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a9f7d2e5dbd604fe7dff03cd7e47860e/Screen_Shot_2015-04-06_at_15.15.44.png)

After:

![Screen_Shot_2015-04-06_at_15.15.34](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c5be6cdbe32d1064da7497a1879a9eb3/Screen_Shot_2015-04-06_at_15.15.34.png)

See merge request !498
2015-04-07 09:55:48 +00:00
Dmitriy Zaporozhets 18dfe0ce76 Merge branch 'emailsonpush-last-line' into 'master'
Fix final line in EmailsOnPush email diff being rendered as error.

Fixes https://github.com/gitlabhq/gitlabhq/issues/8976 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2194.

Pulls in gitlab_git 7.1.5, which includes https://gitlab.com/gitlab-org/gitlab_git/merge_requests/18.

See merge request !480
2015-04-07 09:54:23 +00:00
Dmitriy Zaporozhets d21d5d2d72 Merge branch 'import-event' into 'master'
Add event to activity feed for imported projects.

![Screen_Shot_2015-04-06_at_14.51.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/07fd16cb558873d2a6fb6c3cfcfdb227/Screen_Shot_2015-04-06_at_14.51.16.png)

See merge request !496
2015-04-07 09:46:11 +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
Robert Speicher 167a6b9eef Render a 404 when RefsController#logs_tree gets an HTML request
Fixes #2152
2015-04-06 23:08:28 -04:00
Douwe Maan cf0e84cf04 Add icons to Add dropdown items. 2015-04-06 15:13:50 +02:00
Douwe Maan ee9e922e96 Move project file links to tab bar. 2015-04-06 15:04:13 +02:00
Douwe Maan 4740242a67 Change text of project creation event for imports. 2015-04-06 14:51:41 +02:00
Douwe Maan 99abbe7dbe Use Projects::CreateService to create imported projects so hooks are executed. 2015-04-06 14:51:09 +02:00
Douwe Maan e69e430ce7 Allow projects to be imported into namespaces user is master of. 2015-04-06 14:50:43 +02: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