home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Igor Kostenko 2a06bec3a3 gitlab 7.9.2 2015-04-07 16:49:15 +01: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
Valery Sizov bafec400f1 CI forking: tests 2015-04-06 19:45:16 +03: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
Valery Sizov 9c2301808b CI project forking 2015-04-06 15:20:58 +03:00
Douwe Maan f915a4b80f Warn when gitlab-shell version doesn't match requirement. 2015-04-06 14:02:49 +02:00
Douwe Maan f2af30f195 Skip email confirmation when set by admin or via LDAP. 2015-04-06 13:27:19 +02:00
Ben Bodenmiller 8e512791eb update text to reference new location of setting 2015-04-05 23:27:26 -07: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
Douwe Maan 06399b3261 Show Google Code image attachments inline. 2015-04-04 14:19:05 +02: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 16e1076e6f Update tests. 2015-04-03 18:03:34 +02:00
Douwe Maan e33ddfebf2 Refactor ClosingIssueExtractor. 2015-04-03 18:03:26 +02:00
Douwe Maan b492f0f86e Refactor ReferenceExtractor. 2015-04-03 18:03:15 +02:00
Douwe Maan 9d647197da Don't require user to every gfm call. 2015-04-03 18:03:01 +02:00
Douwe Maan 7b9ae32eff Allow byebug to be used in test. 2015-04-03 18:02:16 +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
Douwe Maan e8fb197da2 Fix tests. 2015-04-03 17:09:15 +02:00
Douwe Maan c590cd3443 Mask owner email when updated. 2015-04-03 16:21:32 +02:00
Douwe Maan 17e2310878 Add instructions to Google Code import page. 2015-04-03 16:02:39 +02:00
Stan Hu 81a5a9713d Add ability to configure Reply-To address in gitlab.yml 
Closes #1305
 2015-04-03 06:47:54 -07:00
Douwe Maan 7b5bc32cad Allow projects to be imported from Google Code. 2015-04-03 15:29:27 +02: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
Douwe Maan 6237cae1f1 Add admin deploy keys tests. 2015-04-03 12:51:01 +02:00
Douwe Maan 9b3624071e Add project deploy keys tests. 2015-04-03 12:40:14 +02:00
Douwe Maan ed097df627 Clean up code. 2015-04-03 12:28:47 +02:00
Douwe Maan a243e44ca1 Fix failing specs. 2015-04-03 12:23:20 +02:00
Douwe Maan edc4a56d26 Allow admin to create public deploy keys that are accessible to any project. 2015-04-03 12:23:20 +02: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