home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 6992879609 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-07-23 12:21:35 +03:00
Dmitriy Zaporozhets 2e3b92d776 Merge branch 'fix-for-ruby-1-9' into 'master' 
Fix for ruby 1.9

Fixes #1452

See merge request !988
 2014-07-23 09:21:07 +00:00
Dmitriy Zaporozhets f0bfeb6e33 Refactor explore area tests. Replaced old links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 12:18:51 +03:00
Dmitriy Zaporozhets 367445fdcd Refactor explore area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 12:03:49 +03:00
Dmitriy Zaporozhets 059f3a34ac Check ruby version to be >= 2.0.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 11:44:27 +03:00
Dmitriy Zaporozhets 667f40d271 Force encoding utf-8 for ruby 1.9 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 11:34:28 +03:00
Sytse Sijbrandij 6eb50a69f4 Based on http://www.reddit.com/r/linux/comments/2bffgt/gitlab_71_released/cj59wvz reword this requirement, thankstictatonifonical. 2014-07-23 10:18:41 +02:00
Dmitriy Zaporozhets 1df0345e9e Explore area 
Create one place for exploring GitLab instance projects and groups for
both signed in and anonymous users

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 11:13:33 +03:00
Sytse Sijbrandij ccfd881386 Integrate lessons from the latest release. 2014-07-23 09:00:19 +02:00
Sytse Sijbrandij 7738383f1b Simplofy the tweet. 2014-07-22 16:36:29 +02:00
Jeroen van Baarsen 561c308e80 Merge pull request #7348 from creativepsyco/patch-1 
Typo fix.
 2014-07-22 14:56:56 +02:00
Tomas Srna 1072c95180 Attachment URL with non-/ relative root 
The attachment URL was not working with relative_url_root not equal to '/'. I suggest this fix.
 2014-07-22 13:29:41 +02:00
Mohit Kanwal 0c0b737b1e Typo fix. 2014-07-22 18:20:35 +08:00
Dmitriy Zaporozhets 6b4d5d21be Merge branch 'public-groups' of https://github.com/innogames/gitlabhq into 7-2-dev 2014-07-22 13:19:45 +03:00
Dmitriy Zaporozhets 68a9203bce Version to 7.1.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v7.1.0 		2014-07-22 09:52:19 +03:00
Dmitriy Zaporozhets 98c66b508c Merge branch 'use_fullpath' into 'master' 
If referer in request is incorrect use fullpath

Fixes #1444

See merge request !982
 2014-07-22 06:50:35 +00:00
Marin Jankovski b421750035 Call store_location_for once. 2014-07-22 08:34:16 +02:00
Dmitriy Zaporozhets 4f47eaf9ae Merge branch 'fix-default-branch' into 'master' 
Fix project default branch change

It is a regression since 7.0. It was caused with switch to `strong_params`.

This MR is safe to merge and it fixes issue https://gitlab.com/gitlab-org/gitlab-ce/issues/433

See merge request !984
 2014-07-22 06:12:00 +00:00
Dmitriy Zaporozhets af2a6ec150 Add useless test. Uncomment when we improve testing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-21 22:52:01 +03:00
Dmitriy Zaporozhets 2a4c73c0a2 Fix project default branch change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-21 22:47:41 +03:00
Dmitriy Zaporozhets c5678d4ecb Merge branch 'fix_signup_config' into 'master' 
Fix signup config

See merge request !983
 2014-07-21 15:57:46 +00:00
Ayrton Araújo 07537faca7 Add support to set satellites timeout 2014-07-21 11:50:29 -04:00
Dmitriy Zaporozhets 648cd13438 Merge branch 'patch-email' into 'master' 
Patch email

See merge request !981
 2014-07-21 15:30:11 +00:00
Jacob Vosmaer 285bb09b98 Move signup_enabled and signin_enabled back 
This partially reverts b5543be19d by restoring the nesting
for the signup_enabled and signin_enabled attributes.
 2014-07-21 17:10:28 +02:00
Marin Jankovski 9714061bb0 If the referer is not set, use fullpath. 2014-07-21 15:45:27 +02:00
Dmitriy Zaporozhets cfde0936ea Merge branch 'file-upload-bugfix' into 'master' 
Bugfix for Multiple File Upload Dialogs

Fixes issue #426, where a page with multiple dropzones can accidentally trigger multiple file upload dialogs when the user clicks the "selecting them" link.

By specifying the closest "div-dropzone-wrapper" before sending a click to "div-dropzone", duplicate events are prevented from firing.

See merge request !153
 2014-07-21 10:36:24 +00:00
Dmitriy Zaporozhets 72f50fcb2c Merge branch 'fix/avatar_relative_url' into 'master' 
Fix Avatar and Relative URL

Fixes https://github.com/gitlabhq/gitlabhq/issues/7270

Instead of `URI::join` use a simple join with a slash. This is how all other places in GitLab join URLs and it doesn't muck with the relative path.

See merge request !144
 2014-07-21 10:34:41 +00:00
Ciro Santilli a02ff56b4d Increase diff byte highlight contrast. 2014-07-21 12:25:26 +02:00
Sytse Sijbrandij ebc1c4bde9 Account for the EE only situation. 2014-07-21 10:50:03 +02:00
Sytse Sijbrandij e443e59542 Simplify email procedure now that subscribers are on the newsletter list. 2014-07-21 10:47:38 +02:00
Dmitriy Zaporozhets 6a10e2e52a Mention email change in README 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-20 09:23:25 +03:00
Dmitriy Zaporozhets 91ab8570c7 Merge branch 'change-admin-email' into 'master' 
Change admin email

Related to #1446

See merge request !979
 2014-07-20 06:21:14 +00:00
Dmitriy Zaporozhets d8af525926 Merge branch 'rc-twitter' into 'master' 
Rc twitter

/cc @marin

See merge request !978
 2014-07-19 20:56:00 +00:00
Dmitriy Zaporozhets c86962e098 Change deafult admin email to example.com 2014-07-19 14:27:01 +03:00
Steven Mok 69dc5461c3 Fix timeout error when preparing git graph. 2014-07-18 23:03:23 +08:00
Sytse Sijbrandij 3926150f5f Improve rc tweet. 2014-07-18 15:17:40 +02:00
Sytse Sijbrandij 84b6163b79 Merge branch 'release-template' into 'master' 
Release template

See merge request !974
 2014-07-18 13:16:20 +00:00
Hiroyuki Sato a10f5fadb5 Fix 404 error when clicking the branch link on hipchat message 2014-07-18 20:20:18 +09:00
GitLab 824821b4e9 Fixing an issue where pages with multiple dropzones can trigger multiple file upload dialogs under certain conditions. 2014-07-17 21:33:21 +00:00
Ciro Santilli e1d307bf4b Move destroy user feature to spec. 2014-07-17 23:22:40 +02:00
Ciro Santilli 1591467655 Helper instead of template. 2014-07-17 22:47:17 +02:00
Ciro Santilli 0a6e978db7 Fix hound. 2014-07-17 22:47:17 +02:00
Ciro Santilli 9b5c7a4d60 Add star count, view logic, more tests. 2014-07-17 22:47:16 +02:00
Ciro Santilli ecd771ccdf Move coffee to assets/project 2014-07-17 22:47:16 +02:00
Ciro Santilli c589029667 Fix failing spec. 2014-07-17 22:47:16 +02:00
Ciro Santilli 714f7201d3 Add project stars. 2014-07-17 22:47:16 +02:00
Dmitriy Zaporozhets b634d2801e Merge branch 'release-candidate' into 'master' 
Release candidate

* add 7.0-7.1 update doc
* add 6.0-7.1 update doc
* update installation doc
* Bump version

Part of #1435

See merge request !977
v7.1.0.rc1 		2014-07-17 15:13:49 +00:00
Dmitriy Zaporozhets 2bd20b7c4d Update guide from 6.0 to 7.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:57:04 +03:00
Dmitriy Zaporozhets 4db9c6e0a8 Version to rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:50:04 +03:00
Dmitriy Zaporozhets f59a721ee0 Point installation manual to 7-1-stable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:49:54 +03:00