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
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
Kevin Lyda 644a8437d0 Add link to services api doc. 2015-04-20 10:31:18 +01: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
Robert Speicher 3ae0b8853b Add changelog entry [ci skip] 2015-04-18 18:49:33 -04:00
Douwe Maan 78313410f9 Move changelog item to 7.11. 2015-04-18 23:04:14 +02:00
Robert Speicher 4d1878253e Typo: Issueable -> Issuable 2015-04-18 15:20:15 -04:00
Robert Speicher 8e6fa2555e Add JS specs for replyWithSelectedText 2015-04-18 15:17:26 -04:00
Robert Speicher ca5d0c8250 Add hotkey for "reply with selected text" to Issueable 2015-04-18 15:17:26 -04:00
Robert Speicher 4603bf500a Add 'reply' hotkey to help modal 2015-04-18 15:17:26 -04:00
Robert Speicher ded7053fbf Simplify jasmine.yml since we're using jasmine-rails gem 
A lot of these values are handled by the asset pipeline.
 2015-04-18 15:17:25 -04:00
Robert Speicher 662bdfbeb1 Make StatGraph JS explicitly require its dependencies 
This allows us to test them in a bit more isolation.
 2015-04-18 15:17:25 -04:00
Robert Speicher d5c7b62b8e rails g jasmine_rails:install 2015-04-18 15:17:25 -04:00
Robert Speicher 0fab35217c Add jasmine-rails gem 2015-04-18 15:17:25 -04:00
Robert Speicher e15af6943a Re-run rails g jasmine:install 2015-04-18 15:17:24 -04:00
Robert Speicher 7679c500ab Update jasmine gem 2015-04-18 15:17:24 -04:00
Robert Speicher 7d5fefb780 Fix 'merge_reuests' typo 2015-04-18 15:17:24 -04:00
Douwe Maan 80657c818c Redirect to sign in page after signing out. 2015-04-18 12:06:50 +02: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
Robin Gauß ac509359b8 Fix link to gitlab.yml.example in paragraph 5 2015-04-17 15:00:14 +02: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