home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,746 Commits 48 Branches 340 Tags
6992879609727f4666983d645406fac4e78482ee
Commit Graph
10746 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 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
Jeroen van Baarsen 561c308e80 Merge pull request #7348 from creativepsyco/patch-1 
Typo fix.
 2014-07-22 14:56:56 +02:00
Mohit Kanwal 0c0b737b1e Typo fix. 2014-07-22 18:20:35 +08: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
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
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
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
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
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
Dmitriy Zaporozhets 771f4dbc3e Update guide from 7.0 to 7.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:49:33 +03:00
Dmitriy Zaporozhets f10c189b21 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-07-17 15:56:18 +03:00
Jeroen van Baarsen 2bccce2ebf Merge branch 'doc/fix_update_doc_links' into 'master' 
Fix links in Update guide 5.1 to 6.0

Links have missing slashes and additionally point to `master` branch.
This MR prevents a 404 error (missing slash) and points to the correct branch (6-0-stable) for comparison of the config files.

/cc @sytse
 2014-07-17 10:07:05 +00:00
Jeroen van Baarsen 9054430583 Merge branch 'fix-typo' into 'master' 
Fix typos in CONTRIBUTING.md

This MR fixes two typos in [CONTRIBUTING.md](CONTRIBUTING.md).
 2014-07-17 10:05:41 +00:00
Jeroen van Baarsen d5d6fc3d41 Merge pull request #7257 from cirosantilli/patch-4 
Clariy squash comes after review.
 2014-07-16 22:05:41 +02:00
Sytse Sijbrandij c300788830 Ensure the readme answers the most important questions. 2014-07-16 20:56:58 +02:00
Dmitriy Zaporozhets de582ab375 Fix user params when edit from admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-16 15:12:33 +03:00
Sytse Sijbrandij 9e3694a6e3 Seperate CE in EE merge. 2014-07-16 11:27:18 +02:00
Sytse Sijbrandij 332a3c6d48 Make rc1 for GitLab.com complete and fix boldness. 2014-07-16 11:02:41 +02:00
Dmitriy Zaporozhets aa25c0ffe5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-07-16 11:58:53 +03:00
Dmitriy Zaporozhets 2f78e6d00e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-07-16 11:58:33 +03:00
Dmitriy Zaporozhets cc5a5a03a4 Fix typo in CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-16 11:55:34 +03:00
Sytse Sijbrandij 150aadad33 Merge pull request #7314 from axilleas/houndci_single_quotes 
Make houndci prefer single quotes.
 2014-07-16 10:55:30 +02:00
Dmitriy Zaporozhets 13f5e36076 Merge branch 'release-template' into 'master' 
Release template

See merge request !972
 2014-07-16 07:39:39 +00:00
Achilleas Pipinellis e9a9238165 Make houndci prefer single quotes. 2014-07-16 09:38:42 +03:00
Sytse Sijbrandij c3a7d3e147 Link to issues with # 2014-07-16 08:38:19 +02:00
Dmitriy Zaporozhets e3df8bf015 Merge branch 'release-template' into 'master' 
Release template

Consider moving stuff like the packages from the 22nd to the 21st

See merge request !971
 2014-07-16 06:35:52 +00:00
Dmitriy Zaporozhets 4f00d8fd1c More stuff to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-16 09:30:14 +03:00
Dmitriy Zaporozhets 9879c427ce If MR commits are empty if does not mean compare failed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 23:04:14 +03:00
Sytse Sijbrandij e043da1376 Split work to the 17th and make issue template. 2014-07-15 21:53:20 +02:00