home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,705 Commits 48 Branches 340 Tags
6750e2d53f2e2a4cb15bbc159f29cf4c55e5db4b
Commit Graph
15705 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 6750e2d53f Merge branch 'upgrade-guide-gitlab-shell' into 'master' 
7.10 requires gitlab-shell 2.6.2.

Fixes #1467.

See merge request !552
 2015-04-21 12:48:07 +00:00
Dmitriy Zaporozhets 2505300b7b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/import/google_code_controller.rb
 2015-04-21 15:36:58 +03:00
Dmitriy Zaporozhets 86dfdc36bd Merge branch 'google-code-fixes' into 'master' 
Fix some issues with Google Code importer

Thanks, @mrtux, for reporting all of these.

See merge request !551
 2015-04-21 12:32:00 +00:00
Dmitriy Zaporozhets eca214a671 Merge branch 'gitlab-grack-2.0.1' into 'master' 
Update gitlab-grack to 2.0.1 to get unicorn to stop creating zombies.

Addresses #1461 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2253.

This regression was introduced between 7.9 and the 7.10 rcs, so no changelog item for 7.10 proper.

cc @JobV @jacobvosmaer

See merge request !546
 2015-04-21 10:41:59 +00:00
Jeroen van Baarsen d128bc9241 Merge pull request #9058 from chulkilee/upgrade-hipchat 
upgrade hipchat
 2015-04-21 11:45:48 +02:00
Douwe Maan 2400181a3a Merge branch 'fix-cannot-move-project-error' into 'master' 
Fix "Cannot move project" error message from popping up after a successful transfer

The JavaScript click handlers were never being removed, leading to duplicate requests when attempting to transfer a project to another namespace. The first transfer would succeed but the subsequent ones would fail, leading to the error message saying, "Cannot move project".

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/0c9f61294291514e0c2a48c204b6a1aa/image.png)

I attempted to write a unit test for this, but it was taking me too long to get it right.

Closes #1448 and #1128

See merge request !548
 2015-04-21 09:29:17 +00:00
Douwe Maan c7dc95d1d1 7.10 requires gitlab-shell 2.6.2. 2015-04-21 11:00:26 +02:00
Douwe Maan 0c650dc0e2 Update Google Code importer test. 2015-04-21 10:36:43 +02:00
Douwe Maan 1419e94816 Improve description of Google Code import user map. 2015-04-21 10:33:04 +02:00
Douwe Maan 1c30f77599 Don't autolink masked imported email addresses. 2015-04-21 10:32:48 +02:00
Douwe Maan 18f80c5560 Fix rendering of deleted blocking/blocked-on statuses. 2015-04-21 10:32:29 +02:00
Douwe Maan bc2dd5e772 Import "Comment #10" as "Comment 10" to not incorrectly reference issue. 2015-04-21 10:31:50 +02:00
Douwe Maan c242ca9a17 Get imported links to render correctly by not escaping all special chars. 2015-04-21 10:31:15 +02:00
Douwe Maan 96c03199dd Add "imported from Google Code" to imported issues. 2015-04-21 10:30:23 +02:00
Douwe Maan 355e6868a2 Fix redirect when trying to view invalid Google Code import status. 2015-04-21 10:30:07 +02:00
Stan Hu 6fb1e80a26 Fix "Cannot move project" error message from popping up after a successful project transfer 
Multiple event handlers were firing, causing multiple form submissions.

Closes #1448 and #1128
 2015-04-20 12:46:02 -07:00
Douwe Maan 5bbe2860bf Update gitlab-grack to 2.0.1 to get unicorn to stop creating zombies. 2015-04-20 18:48:53 +02:00
Jeroen van Baarsen 3f73d611cb Merge pull request #9145 from jvanbaarsen/before-action-rubocop 
Fixed the Rails/ActionFilter cop
 2015-04-20 16:14:19 +02:00
Jeroen van Baarsen 5a4ebfb47a Fixed the Rails/ActionFilter cop 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-04-20 15:39:37 +02:00
Dmitriy Zaporozhets 76aade28e2 Merge pull request #9075 from Soullivaneuh/bootlint 
Bootlint integration
 2015-04-20 16:03:43 +03:00
Dmitriy Zaporozhets a4006a6b48 Merge branch 'better-commit-mentions' into 'master' 
Clean up code around commit mentions.

Builds upon !527.

See merge request !528
 2015-04-20 12:42:31 +00:00
Dmitriy Zaporozhets d9f7499046 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-20 15:29:11 +03:00
Dmitriy Zaporozhets 91672f4f0f Merge branch 'revert-username-period' into 'master' 
Revert disallowing usernames to end in period.

cc @JobV @jacobvosmaer

See merge request !545
 2015-04-20 12:28:17 +00:00
Jeroen van Baarsen 2006b90805 Merge pull request #9100 from bbodenmiller/patch-3 
improve new project options
 2015-04-20 13:30:57 +02:00
Douwe Maan c75c6b840b Revert disallowing usernames to end in period. 2015-04-20 12:41:44 +02:00
Ben Bodenmiller 47769bfd59 improve new project options 
* Simplify new repo commands
* Include directions for how to add an existing folder that is either
already a repo or not yet a repo

Replaces #7918.
 2015-04-20 03:13:39 -07:00
Dmitriy Zaporozhets 41f01dd3f4 Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master' 
Remove access control for uploaded images to fix broken images in emails

Replaces !530.

> This MR removes the access control for uploaded images. This is needed to display the images in emails again.
>
> The previous solution to base64 encode the images had to be reverted, because not all email clients supported it.
>
> If possible this should go into the 7.10 release.

See merge request !533
 2015-04-20 09:43:01 +00:00
Dmitriy Zaporozhets 457efe2446 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-20 12:36:41 +03:00
Dmitriy Zaporozhets 61ebd14d5d Merge branch 'gitlab_git-7.1.10' into 'master' 
Ignore submodules that are defined in .gitmodules but are checked in as directories.

Pulls in gitlab_git 7.1.10 which contains gitlab-org/gitlab_git!26.

Fixes #1439 and https://github.com/gitlabhq/gitlabhq/issues/9140

See merge request !540
 2015-04-20 09:34:54 +00:00
Dmitriy Zaporozhets 4bd5aa26ca Merge pull request #9156 from hellerve/master 
Fixed typo in deploy html
 2015-04-20 12:28:29 +03:00
Jeroen van Baarsen 4f349fcb69 Merge pull request #9150 from digitalmediacenter/master 
do not prepend relative_url_root to avatar
 2015-04-20 11:01:59 +02:00
Dmitriy Zaporozhets 0e9d52f33d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-20 11:40:55 +03:00
Dmitriy Zaporozhets bd97715a57 Merge branch 'fix-label-color' into 'master' 
Parse GFM references after sanitizing

Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`.  See #2188.

See merge request !1745
 2015-04-20 08:40:13 +00:00
hellerve 0afccd1dd8 Fixed typo in deploy html 2015-04-20 10:38:38 +02:00
Dmitriy Zaporozhets d012648b49 Merge branch 'fix-label-color-input' into 'master' 
Fix label color input.

Because `value` was set, every label color would render as purple in the form.

Introduced by 83b5a9ae2b between 7.9 and 7.10, so no changelog item.

See merge request !538
 2015-04-20 08:30:05 +00:00
Leo Antunes f2a817f040 do not prepend relative_url_root to avatar 
The commit.author.icon variable contains a full URL, which gets broken
when prepended by the relative_url_root setting (generating hrefs like
"/gitlabhttps://...".
 2015-04-20 09:52:03 +02:00
Marin Jankovski e883aae0e7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-20 09:43:37 +02:00
Marin Jankovski 225b43de22 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-20 09:43:28 +02:00
Dmitriy Zaporozhets 41b45ece99 Merge branch 'rs-issue-2219' into 'master' 
Let Bootstrap's tab JS handle history

Closes #2219

See merge request !1784
 2015-04-19 16:30:26 +00:00
Dmitriy Zaporozhets 359f01c9e0 Merge branch 'rs-issue-2212' into 'master' 
Revert and re-fix image rendering in help pages

Closes #2212

See merge request !1765
 2015-04-19 16:24:17 +00:00
Vinnie Okada df9a992c15 Fix GFM extractions 
Extract and re-insert links after sanitizing user markup.
 2015-04-17 20:39:38 -06:00
Patricio Cano f66360859e Merge branch 'add_section_on_SSH_documentation' into 'master' 
Add the text "Add your ssh key to an application" with link to http://wiki.eclip&hellip;

&hellip;se.org/EGit/User_Guide#Eclipse_SSH_Configuration

Add text "Add your ssh key to an application" with link to http://wiki.eclipse.org/EGit/User_Guide#Eclipse_SSH_Configuration
Add on document http://doc.gitlab.com/ce/ssh/README.html

Reference:
https://twitter.com/elraro21/status/585146770709151747

See merge request !1774
 2015-04-17 22:17:19 +00:00
Robert Speicher 269aee790c Let Bootstrap's tab JS handle history 
Closes #2219
 2015-04-17 16:42:38 -04:00
Douwe Maan 865444f1d8 Ignore submodules that are defined in .gitmodules but are checked in as directories. 2015-04-17 20:51:12 +02:00
Douwe Maan 307e7ffdba Merge pull request #9083 from roshangautam/roshangautam-patch-1 
Fix Resource Owner Password Authentication Flow
 2015-04-17 19:09:02 +02:00
Roshan Gautam 984f8077b3 Fix Resource Owner Password Authentication Flow 2015-04-17 11:47:02 -05:00
Douwe Maan da89ebbe48 Fix label color input. 2015-04-17 17:38:31 +02:00
Dmitriy Zaporozhets a66953b16b Merge branch 'google-code-changelog' into 'master' 
Add Google Code importer to changelog.

cc @dzaporozhets

See merge request !537
 2015-04-17 14:43:44 +00:00
Douwe Maan 632d05e865 Add Google Code importer to changelog. 2015-04-17 16:40:22 +02:00
Dmitriy Zaporozhets e1099f9717 Merge branch 'google-code-import-performance' into 'master' 
Decrease memory use and increase performance of Google Code importer.

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

See merge request !536
 2015-04-17 14:01:33 +00:00