home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +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
Marin Jankovski e5fb2ad908 Merge branch 'search-wiki-keyword' into 'master' 
Prevent 500 error on search results if description contains relative link

Bug: If I add relative link to comment or description and search for it - I get 500 error on search page.

Reason for this is that we use `@repository` variable. But for pages like search it does not assigned.
In future we should avoid using such variables. Especially in markdown parser that can be used on different pages

Fixes #1601

See merge request !1111
 2014-09-23 15:55:14 +00:00
Dmitriy Zaporozhets ea1eda2124 Merge branch 'unicorn-timeout' into 'master' 
Increase unicorn timeout

From 30 seconds to 60 seconds

Fixes #1579

See merge request !1110
 2014-09-23 15:18:05 +00:00
Marin Jankovski 2bb7a5bbea Merge branch 'fix-diff-500' into 'master' 
Fix 500 when viewing diff if a file changed permission

Fixes #1613

See merge request !1109
 2014-09-23 15:13:04 +00:00
Marin Jankovski 80b58184d3 Merge branch 'fix-mr-commit-comment' into 'master' 
Fix MR commenting system when new commits pushed

Fixes #1608

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`

See merge request !1108
 2014-09-23 15:10:28 +00:00
Marin Jankovski e81fa0e66d Merge branch 'fix_git_access' into 'master' 
Fix ref parsing in Gitlab::GitAccess

See merge request !1107
 2014-09-23 15:02:06 +00:00
Marin Jankovski a33d7a4049 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-23 17:01:24 +02:00
Dmitriy Zaporozhets 1e980ffbad Prevent 500 error on search results if description contains relative link 2014-09-23 17:56:41 +03:00
Dmitriy Zaporozhets b083ab83ea Increase unicorn timeout to 60 seconds 2014-09-23 17:11:16 +03:00
Dmitriy Zaporozhets b897cc63a5 Fix 500 error on diff if file permission changed 2014-09-23 16:14:17 +03:00
Dmitriy Zaporozhets a5d23ae3c8 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 14:20:21 +03:00
Jacob Vosmaer f12d6278ed Fix ref parsing in Gitlab::GitAccess 2014-09-23 13:18:36 +02:00
Jacob Vosmaer d5c81a8d4a Merge pull request #7692 from mr-vinn/fix-spec-rm 
Use FileUtils to delete instead of File
 2014-09-23 11:23:47 +02:00
Sytse Sijbrandij e586ee347f Merge branch 'monthly_doc' into 'master' 
Add to monthly doc that reverting is an option

See merge request !1106
 2014-09-23 07:13:25 +00:00
Marin Jankovski 0f7cad07d0 Add to monthly doc that reverting a feature is an option. 2014-09-23 09:03:38 +02:00
Sytse Sijbrandij 0241efba59 Use origin to compare so it is not dependent on checking out the branch before. 2014-09-23 08:40:46 +02:00
Ciro Santilli 065ab3e5f3 Only clone GitLab Shell on tests if necessary. 2014-09-22 21:37:52 +02:00
Ciro Santilli 83e8f923a3 Remove ununsed CONTRIBUTING link on edit MR form. 
The code is never reached because the new and edit MR forms have diverged,
and the CONTRIBUTING link is not shown when editing MRs.
 2014-09-22 21:34:16 +02:00
Ciro Santilli 705fe01dca Factor issue and edit MR form label field and submit. 2014-09-22 21:24:25 +02:00
Ciro Santilli 778afb699f Replace javascript:; links with buttons. 2014-09-22 21:01:19 +02:00
Dmitriy Zaporozhets 248990b5e8 Merge pull request #7772 from cirosantilli/resize-vertical 
[UI] Set textarea resize:vertical by default.
 2014-09-22 21:03:57 +03:00
Dmitriy Zaporozhets e54fdee436 Merge pull request #7657 from cirosantilli/factor-commit-list 
[refactor] Factor out commit list from compare and new MR.
 2014-09-22 21:03:29 +03:00
Dmitriy Zaporozhets 6a1323f12a Merge pull request #7792 from cirosantilli/link_to_reply_diff 
Fix link_to_reply_diff.
 2014-09-22 21:02:43 +03:00
Dmitriy Zaporozhets f96b954b1c Merge pull request #7804 from cirosantilli/factor-issue-mr-form-error 
Factor issue and MR edit form error list.
 2014-09-22 21:01:03 +03:00
Dmitriy Zaporozhets db12e2dc8d Merge pull request #7807 from cirosantilli/factor-service-error 
Factor error and success methods from services.
 2014-09-22 21:00:11 +03:00
Dmitriy Zaporozhets ed9a6bf99c Merge pull request #7758 from bbodenmiller/patch-1 
cleanup empty repo page
 2014-09-22 20:57:27 +03:00
Dmitriy Zaporozhets c31c8c55a4 Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/markdown_render.rb
 2014-09-22 20:56:12 +03:00
Dmitriy Zaporozhets fbdf34d7ab Merge pull request #7821 from cirosantilli/factor-spinach-classes 
[factor] Prefix Spinach features with Spinach::Features::.
 2014-09-22 20:54:37 +03:00
Dmitriy Zaporozhets 53fb63c0a0 Merge branch 'update-highlight-js' into 'master' 
Update highlight.js to 8.2

highlight.js generated using build script `build.py` for all languages.

See merge request !175
 2014-09-22 17:52:30 +00:00
Dmitriy Zaporozhets 8cd882355e Merge branch '7-4-pre' into 'master' 
7.4 development

Development branch during `master` code freeze for 7.3

See merge request !1096
 2014-09-22 17:25:49 +00:00
Sytse Sijbrandij b3c53efc42 Merge branch 'monthly_release_document_update' into 'master' 
Monthly release document update

See merge request !1092
 2014-09-22 17:23:47 +00:00
Vinnie Okada 8ec602e64f Fix invalid method in test 
Use FileUtils::rm_f to delete the satellite lock file.
 2014-09-22 11:50:27 -05:00
Marin Jankovski 441237eea5 Update doc that 7.3 is released. 2014-09-22 18:09:49 +02:00
Marin Jankovski c108839cb9 More updates to release doc. 2014-09-22 17:26:18 +02:00
Marin Jankovski 7d7ba112b6 Issue name of QA. 2014-09-22 17:15:53 +02:00
Marin Jankovski 68bb1701cd Update monthly release doc that we are not using travis anymore. 2014-09-22 17:15:53 +02:00
Marin Jankovski 3a9c294ac0 Add steps for building and deploying gitlab.com packages to monthly release document. 2014-09-22 17:15:53 +02:00
Marin Jankovski 0b85e2a606 Order of tasks in monthly release doc. 2014-09-22 17:15:53 +02:00
Marin Jankovski acf4d039f5 Time for 7.4.0-pre. 2014-09-22 17:08:16 +02:00
Ciro Santilli de6c8778f7 Prefix Spinach features with Spinach::Features::. 2014-09-22 16:30:25 +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
Sytse Sijbrandij 6f61cbd162 Add wisdom about reverting a revert merge. 2014-09-22 13:10:13 +02:00
Sytse Sijbrandij 4160180621 Improve the wording explaining protected branches. 2014-09-22 12:25:07 +02:00
Ciro Santilli ef6e94e37e Replace old spinach step definitions with step. 2014-09-22 10:01:50 +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