home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,748 Commits 48 Branches 340 Tags
d7f61affaf845f44b4cc995e34eb1606c47c8eff
Commit Graph
15748 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets d7f61affaf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-21 19:45:27 +03:00
Dmitriy Zaporozhets 0a23688c14 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-21 19:44:52 +03:00
Dmitriy Zaporozhets 2cd501f7e4 Merge branch 'rs-reference-filters' into 'master' 
Convert GFM reference handling to html-pipeline filters

- `Gitlab::Markdown` is now much cleaner
- Better separation of concerns
- Cleaner, less brittle, more maintainable specs for each reference type.
- Label references actually work!

See merge request !1753
 2015-04-21 16:43:54 +00:00
Dmitriy Zaporozhets 58faf307d2 Merge pull request #8510 from koebi001/feature/backup_restore 
add environment variable force to the documentation
 2015-04-21 19:04:59 +03:00
Hannes Rosenögger c8301914e8 Merge branch 'fix-duplicate-changelog-entry' into 'master' 
Remove entry that was shipped in v7.9.1

See merge request !532
 2015-04-21 14:15:57 +00:00
Dmitriy Zaporozhets 6750e2d53f Merge branch 'upgrade-guide-gitlab-shell' into 'master' 
7.10 requires gitlab-shell 2.6.2.

Fixes #1467.

See merge request !552
 2015-04-21 12:48:07 +00:00
Dmitriy Zaporozhets 2505300b7b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/import/google_code_controller.rb
 2015-04-21 15:36:58 +03:00
Dmitriy Zaporozhets 86dfdc36bd Merge branch 'google-code-fixes' into 'master' 
Fix some issues with Google Code importer

Thanks, @mrtux, for reporting all of these.

See merge request !551
 2015-04-21 12:32:00 +00:00
Dmitriy Zaporozhets eca214a671 Merge branch 'gitlab-grack-2.0.1' into 'master' 
Update gitlab-grack to 2.0.1 to get unicorn to stop creating zombies.

Addresses #1461 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2253.

This regression was introduced between 7.9 and the 7.10 rcs, so no changelog item for 7.10 proper.

cc @JobV @jacobvosmaer

See merge request !546
 2015-04-21 10:41:59 +00:00
Jeroen van Baarsen d128bc9241 Merge pull request #9058 from chulkilee/upgrade-hipchat 
upgrade hipchat
 2015-04-21 11:45:48 +02:00
Douwe Maan 2400181a3a Merge branch 'fix-cannot-move-project-error' into 'master' 
Fix "Cannot move project" error message from popping up after a successful transfer

The JavaScript click handlers were never being removed, leading to duplicate requests when attempting to transfer a project to another namespace. The first transfer would succeed but the subsequent ones would fail, leading to the error message saying, "Cannot move project".

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/0c9f61294291514e0c2a48c204b6a1aa/image.png)

I attempted to write a unit test for this, but it was taking me too long to get it right.

Closes #1448 and #1128

See merge request !548
 2015-04-21 09:29:17 +00:00
Douwe Maan c7dc95d1d1 7.10 requires gitlab-shell 2.6.2. 2015-04-21 11:00:26 +02:00
Douwe Maan 0c650dc0e2 Update Google Code importer test. 2015-04-21 10:36:43 +02:00
Douwe Maan 1419e94816 Improve description of Google Code import user map. 2015-04-21 10:33:04 +02:00
Douwe Maan 1c30f77599 Don't autolink masked imported email addresses. 2015-04-21 10:32:48 +02:00
Douwe Maan 18f80c5560 Fix rendering of deleted blocking/blocked-on statuses. 2015-04-21 10:32:29 +02:00
Douwe Maan bc2dd5e772 Import "Comment #10" as "Comment 10" to not incorrectly reference issue. 2015-04-21 10:31:50 +02:00
Douwe Maan c242ca9a17 Get imported links to render correctly by not escaping all special chars. 2015-04-21 10:31:15 +02:00
Douwe Maan 96c03199dd Add "imported from Google Code" to imported issues. 2015-04-21 10:30:23 +02:00
Douwe Maan 355e6868a2 Fix redirect when trying to view invalid Google Code import status. 2015-04-21 10:30:07 +02:00
Stan Hu 6fb1e80a26 Fix "Cannot move project" error message from popping up after a successful project transfer 
Multiple event handlers were firing, causing multiple form submissions.

Closes #1448 and #1128
 2015-04-20 12:46:02 -07:00
Robert Speicher b389424627 Skip failing test until usernames can't end in periods again 2015-04-20 13:01:47 -04:00
Douwe MaanandRobert Speicher c52bf4ad3c Tweak single-word label regex to fix pending spec. 2015-04-20 13:01:47 -04:00
Douwe MaanandRobert Speicher b5802d144b project_from_ref returns nil when reference doesn't exist. 2015-04-20 13:01:47 -04:00
Robert Speicher b595249462 Update markdown docs with latest references 
Also, tables! (╯°□°）╯︵ ┻━┻)
 2015-04-20 13:01:47 -04:00
Robert Speicher 2823c058d8 project_from_ref returns nil when reference can't be accessed 
Prior it would return the project from the current context, which wasn't
the intended behavior.
 2015-04-20 13:01:47 -04:00
Robert Speicher 3a0b4340aa Add more tests for cross-project references 2015-04-20 13:01:46 -04:00
Robert Speicher 34f1dbb143 Better commit lookup for CommitRangeReferenceFilter 2015-04-20 13:01:46 -04:00
Robert Speicher 6853465acf Remove extraneous IGNORE_PARENTS from filter 2015-04-20 13:01:46 -04:00
Robert Speicher 621687bfdf Fix user_can_reference_project? check 2015-04-20 13:01:46 -04:00
Robert Speicher b905702d4f Escape title attributes in references 2015-04-20 13:01:46 -04:00
Robert Speicher a3c71d9898 Add spec for ReferenceExtractor#labels 2015-04-20 13:01:46 -04:00
Robert Speicher 31172475d2 Better guard against nil projects in ReferenceFilter 2015-04-20 13:01:46 -04:00
Robert Speicher 9eaaa7cdef Minor doc fix 
[ci skip]
 2015-04-20 13:01:45 -04:00
Robert Speicher 5b6c1a2182 Fix Issue and ExternalIssue reference specs 2015-04-20 13:01:45 -04:00
Robert Speicher b3b8fc6c8a DRY up reference filters using ReferenceFilter base class 2015-04-20 13:01:45 -04:00
Robert Speicher 6189b24fdd Add a ReferenceFilter base class 
This will allow for the removal of a lot of duplication from the
reference filters.
 2015-04-20 13:01:45 -04:00
Robert Speicher c4eb6a55f1 Fix user_can_reference_group? check 2015-04-20 13:01:45 -04:00
Robert Speicher 52909f8bdb Add permission check to ReferenceExtractor's user mentions 2015-04-20 13:01:45 -04:00
Robert Speicher b0ea7b3b3d Fix cross-project reference specs for new permission check 
For simplicity's sake, since we're testing the actual referencing, we
just force the permission check to always be allowed.
 2015-04-20 13:01:44 -04:00
Robert Speicher 62282971e0 Rename user_can_read_group? to user_can_reference_group? 2015-04-20 13:01:44 -04:00
Robert Speicher a803cd51eb Check for project read permissions in cross-references 2015-04-20 13:01:44 -04:00
Robert Speicher 470b0c2508 Remove more now-invalid specs 2015-04-20 13:01:44 -04:00
Robert Speicher 4d3a634ece Fix broken spec 2015-04-20 13:01:44 -04:00
Robert Speicher b41eb34503 Re-arrange spec/helpers/gitlab_markdown_helper_spec a bit 2015-04-20 13:01:44 -04:00
Robert Speicher f76df89058 Begin cleaning out spec/helpers/gitlab_markdown_helper_spec 2015-04-20 13:01:44 -04:00
Robert Speicher 34a23bda60 Add current_user to filter context 2015-04-20 13:01:43 -04:00
Robert Speicher 43c62ca3f2 Remove Gitlab::Markdown from Gitlab::ReferenceExtractor 2015-04-20 13:01:43 -04:00
Robert Speicher 29604ff2c3 Add permission checking to UserReferenceFilter 2015-04-20 13:01:43 -04:00
Robert Speicher 189c5347be Add name-based referencing to LabelReferenceFilter 2015-04-20 13:01:43 -04:00