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,672 Commits 48 Branches 340 Tags
5bbe2860bf3f9e24d2f658aa2a32baabbe997cea
Commit Graph
15672 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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…

…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
Douwe Maan 38982136ec Decrease memory use and increase performance of Google Code importer. 2015-04-17 14:55:51 +02:00
Douwe Maan 7d98c8842d Move import data out of project so it doesn't take ages to load. 2015-04-17 14:49:00 +02:00
Dmitriy Zaporozhets ea939d4691 Merge branch 'gitlab_git-7.1.9' into 'master' 
Update gitlab_git to ignore invalid lines in .gitmodules.

Pulls in gitlab_git 7.1.9 which contains https://gitlab.com/gitlab-org/gitlab_git/merge_requests/24

Closes #1412, https://github.com/gitlabhq/gitlabhq/issues/8135 and https://github.com/gitlabhq/gitlabhq/issues/8881

See merge request !535
 2015-04-17 11:37:15 +00:00
Douwe Maan dfebcb89e6 Don't save unchanged user map items to the DB. 2015-04-17 13:32:29 +02:00
Dmitriy Zaporozhets 7266c78b76 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-17 14:32:04 +03:00
Dmitriy Zaporozhets 07c149de74 Merge branch 'fix-username-period-migration' into 'master' 
Fix username period migration to preserve uniqueness of names and paths.

See merge request !534
 2015-04-17 10:58:43 +00:00
Douwe Maan 779f05ef0e Explain skip_before_filter workaround. 2015-04-17 12:49:20 +02:00
Douwe Maan 2d913e5a9a Update gitlab_git to ignore invalid lines in .gitmodules. 2015-04-17 12:23:28 +02:00
Douwe Maan 46524ecb33 Fix username period migration to preserve uniqueness of names and paths. 2015-04-17 12:03:54 +02:00
Douwe Maan 3adbb8b10d Tweak changelog item. 2015-04-17 11:35:44 +02:00
Douwe Maan 1615d3de39 Add tests. 2015-04-17 11:33:58 +02:00
Douwe Maan 305725f8d5 Correctly handle blocked users. 2015-04-17 11:33:53 +02:00
Dmitriy Zaporozhets 5ba7a8e023 Merge branch 'repo-check-task' into 'master' 
Add new rake task to check repo integrity

Add a `gitlab:repo:check` task that checks repository integrity with `git fsck`.  See #1819.

See merge request !1778
 2015-04-17 09:22:41 +00:00
Marin Jankovski 5456b00f27 Merge pull request #8212 from dmedvinsky/fix-url-field 
Fix auto-selection of URL field with X11 selection
 2015-04-17 10:59:20 +02:00
Marin Jankovski e988cdba47 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-17 10:58:15 +02:00
Dmitry Medvinsky 92544df8da Fix auto-selection of URL field with X11 selection 
We use `focusin` event instead of `click` because when using the latter,
when the selection is created it isn't put into X11 PRIMARY selection.
And as a Linux user I'm very used to such behaviour that when something
gets selected, it's ready for pasting, which is the primary purpose of
the clone URL field.

When `focusin` is used, the selection is copied to X11 buffer
automatically, so it works as expected (tested in Firefox and Chrome).
 2015-04-17 10:16:18 +03:00
Dmitriy Zaporozhets f71a4b145a Merge pull request #9147 from jvanbaarsen/changelof-7-11 
Added changelog for 7.11
 2015-04-16 17:38:31 +03:00
Jeroen van Baarsen a4d9394b46 Added changelog for 7.11 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-04-16 16:16:01 +02:00
Dmitriy Zaporozhets 36677a9b54 Merge branch 'update-changelog' into 'master' 
Add 7.9.4 to CHANGELOG

See merge request !531
 2015-04-16 13:51:06 +00:00
Dmitriy Zaporozhets e24ed47f8f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-16 15:29:43 +03:00
Dmitriy Zaporozhets 9042d8d2b2 Merge pull request #9131 from chulkilee/ruby-2.1.6 
ruby 2.1.6
 2015-04-16 15:27:29 +03:00
Jeroen van Baarsen b18b9a55be Merge pull request #9094 from bbodenmiller/patch-1 
update text to reference new location of setting
 2015-04-16 14:23:38 +02:00
Job van der Voort a7760993c6 Merge branch 'update-install-guides-710' into 'master' 
update guides for 7.10

See merge request !1779
 2015-04-16 12:19:21 +00:00
Job van der Voort 42237e363b update guides for 7.10 2015-04-16 14:16:46 +02:00
Dmitriy Zaporozhets 2a0a48a402 Add 7.9.4 to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-16 15:16:04 +03:00