home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,651 Commits 48 Branches 340 Tags
7-3-stable
Commit Graph
11651 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Patricio Cano fb69ad35fd Version 7.3.3 v7.3.3 2015-01-09 10:53:16 -05:00
Dmitriy Zaporozhets c1d9ba479c Merge branch '7-3-gitlab-git-update' into '7-3-stable' 
Bump gitlab_git version to 6.2.2 for 7.3

We need to bump the gitlab_git version for 7-3-stable to 6.2.2 so that it includes the 0.21.2 version of rugged.

QA Tests have been performed to warrant compatibility.

/cc @jacobvosmaer @job

See merge request !1377
 2015-01-08 19:46:07 +00:00
Patricio Cano 9b15ec4172 Updated CHANGELOG to include rugged changes. 2015-01-07 19:12:41 -05:00
Patricio Cano 8d97e665ab Updated gitlab_git to 6.2.2 to include rugged 0.21.2 2015-01-05 12:18:38 -05:00
Marin Jankovski f092e53ee9 Version 7.3.2. v7.3.2 2014-10-01 10:00:57 +02:00
Marin Jankovski 1112565db5 Update changelog for 7.3.2 2014-10-01 09:54:54 +02:00
Marin Jankovski e21b7622fd Update guides to use gitlab-shell 2.0.1. 2014-10-01 09:53:12 +02:00
Marin Jankovski 8dedd115ee Update gitlab-shell to v2.0.1. 2014-10-01 09:49:46 +02:00
Dmitriy ZaporozhetsandMarin Jankovski 61ede2f1ff Fix creating new file via web editor 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-01 09:48:38 +02:00
Marin Jankovski 1660aa23e3 Version 7.3.1 v7.3.1 2014-09-24 08:44:07 +02:00
Marin Jankovski 9912a74055 Add fixes to changelog 2014-09-23 17:56:44 +02:00
Dmitriy ZaporozhetsandMarin Jankovski aebe3317b9 Prevent 500 error on search results if description contains relative link 2014-09-23 17:56:16 +02:00
Dmitriy ZaporozhetsandMarin Jankovski 0396f38773 Fix 500 error on diff if file permission changed 2014-09-23 17:13:41 +02:00
Dmitriy ZaporozhetsandMarin Jankovski 8ccae3c385 Fix MR commenting system when new commits pushed 
This conmmit fixes wierd behaviour when you see wrong comments about new
commits in merge requests.

Short explanation of a bug:
When you push new commits to project we updated `project.merge_requests`
with comment about push. But `project.merge_requests` includes also
merge requests from forks to origin project. So when you push to master
branch it commented on all merge requests from forks to origin where
source_branch was `master`
 2014-09-23 17:12:36 +02:00
Jacob VosmaerandMarin Jankovski 0e8ab213be Fix ref parsing in Gitlab::GitAccess 2014-09-23 17:12:23 +02:00
Sytse Sijbrandij 76eaf55d0d Use origin to compare so it is not dependent on checking out the branch before. 2014-09-23 08:41:15 +02:00
Marin Jankovski 8244ce84b1 Update doc that 7.3 is released. 2014-09-22 18:09:14 +02:00
Marin Jankovski a04f0e5b3d Merge branch 'shell_install_socket' 
Conflicts:
	doc/install/installation.md
v7.3.0 		2014-09-22 15:33:07 +02:00
Jacob Vosmaer 4f61061cfb Support sockets in 'rake gitlab:shell:install' 2014-09-22 15:02:46 +02:00
Marin Jankovski 457caaae49 Update manual installation guide for the correct shell version. 2014-09-22 14:50:06 +02:00
Marin Jankovski 88d3da19f9 Version 7.3.0. 2014-09-22 14:35:51 +02:00
Marin Jankovski 2fc6f8f2cb Merge branch 'revert_sticky_headers' into 'master' 
Revert sticky headers

See merge request !1104
 2014-09-22 12:34:03 +00:00
Marin Jankovski f0231e409a Revert "Diff headers made sticky." 
This reverts commit 6eb85b1a30.
 2014-09-22 13:48:28 +02:00
Marin Jankovski b43e918a73 Merge pull request #7815 from Razer6/zen/fix_scroll_position 
Save last scrollposition and scroll back when leaving ZEN mode
 2014-09-22 09:59:23 +02:00
Marin Jankovski 560c41ccf2 Merge pull request #7812 from bbodenmiller/7.3-upgrade 
improve 7.3 upgrade process & redis setup
 2014-09-22 09:59:03 +02:00
Marin Jankovski 8446f37e7c Merge pull request #7809 from bbodenmiller/patch-25 
update gitlab shell to 1.9.8 for gitlab 7.2.2
 2014-09-22 09:57:38 +02:00
Robert Schilling 28ba985ef9 Save last scrollposition and scroll back when leaving ZEN mode 2014-09-21 21:06:38 +02:00
Robert Schilling 90741c8892 Merge pull request #7814 from cirosantilli/test-typo 
Typo it -> its.
 2014-09-21 20:01:17 +02:00
Ciro Santilli b65a2d07e4 Typo it -> its. 2014-09-21 19:45:54 +02:00
Robert Schilling 3fdccd539a Merge pull request #7811 from bbodenmiller/patch-12 
formatting improvements to 6.0-to-7.3.md
 2014-09-21 16:02:02 +02:00
Ben Bodenmiller 559af04f34 improve 7.3 upgrade process & redius setup 
Fixes
https://github.com/gitlabhq/gitlabhq/commit/2b35c887904b6a7a05a7c88fdf1ccd66ba943e20#commitcomment-7829537,
https://github.com/gitlabhq/gitlabhq/commit/5704e6fee9d2dea67c4a91b43d06a9958484d29b#commitcomment-7829367,
&
https://github.com/gitlabhq/gitlabhq/commit/5704e6fee9d2dea67c4a91b43d06a9958484d29b#commitcomment-7829381
 2014-09-21 05:05:48 -07:00
Ben Bodenmiller 244513568c formatting improvements to upgrade guides 2014-09-21 04:28:47 -07:00
Ben Bodenmiller 9cf77b6604 update gitlab shell to 1.9.8 for gitlab 7.2.2 
As committed in https://github.com/gitlabhq/gitlabhq/commit/873acfd9aa54e801d5786c32b05c4f8ad21af72a GitLab 7.2.2 requires GitLab Shell 1.9.8. Fixes https://github.com/gitlabhq/gitlabhq/issues/7806.
 2014-09-21 03:47:24 -07:00
Dmitriy Zaporozhets 9971a9692a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-20 19:22:42 +03:00
Robert Schilling fda61a047f Merge pull request #7805 from Razer6/improve/zen 
Prevent default action when closing zen mode
 2014-09-20 18:17:19 +02:00
Robert Schilling d5badd7ef6 Prevent default action when closing zen mode 2014-09-20 18:15:36 +02:00
Robert Schilling 8fd0d74bd8 Merge pull request #7801 from cirosantilli/dry-zen-view 
Factor zen mode.
 2014-09-20 17:09:20 +02:00
Ciro Santilli adaec60a50 Factor zen mode. 2014-09-20 15:32:46 +02:00
Sytse Sijbrandij 82956a03c7 Merge pull request #7798 from spuder/issue#7763 
Adds support for ruby 1.8 in webhook example
 2014-09-20 11:57:12 +02:00
Spencer Owen b9f0508732 Adds support for ruby 1.8 in webhook example, issue #7763 
By using the hash rocket syntax, the web hook will work on older versions of ruby (1.8) in addition to 1.9, 2.0 ect..
Moves do .. end to separate lines for ruby-lint.

Additional Information:
http://stackoverflow.com/questions/25899476/webrick-gives-error-unexpected-expecting-end
https://github.com/spuder/r10k_gitlab_webhook
 2014-09-19 13:38:12 -06:00
Robert Schilling 24c79205c4 Merge pull request #7771 from cirosantilli/ignore-tags 
Ignore tags file.
 2014-09-19 20:44:12 +02:00
Robert Schilling d40311a91d Merge pull request #7788 from bbodenmiller/patch-25 
link to page that discusses how to generate ssh key
 2014-09-19 20:34:34 +02:00
Robert Schilling 9c08ce63dd Merge pull request #7797 from cirosantilli/zen-style 
Improve zen mode internals.
 2014-09-19 20:18:13 +02:00
Sytse Sijbrandij 71a76f5162 Merge branch 'release-branch-earlier' into 'master' 
Release branch earlier

Fixes #1603

See merge request !1102
 2014-09-19 16:00:44 +00:00
Dmitriy Zaporozhets 9017362889 Merge branch 'same-version-restore' into 'master' 
Same version restore

Warn users about this.

See merge request !1101
 2014-09-19 15:55:05 +00:00
Dmitriy Zaporozhets 4bf3abe2b8 Create stable branch at 17th 2014-09-19 15:44:21 +00:00
Sytse Sijbrandij 7121b4a488 Warn about restoring to the same version. 2014-09-19 17:39:25 +02:00
Ciro Santilli 04ef3ddc6c Improve zen mode internals. 2014-09-19 17:32:23 +02:00
Dmitriy Zaporozhets eb764b1b7b Fix star/fork button UI issue if count > 100 2014-09-19 12:33:09 +00:00
Robert Schilling c759b8c99e Merge pull request #7791 from cirosantilli/patch-6 
CONTRIBUTING typos.
 2014-09-19 13:59:41 +02:00