home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
15081 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Valery Sizov 1308a8a0ef GHE: fix 2015-02-10 16:03:02 +02:00
Valery Sizov 9de15c1e0f GHE importer: single configuration for auth and importer 2015-02-10 15:18:28 +02:00
Valery Sizov fb638cc814 GHE importer 2015-02-06 10:21:30 -08:00
Dmitriy Zaporozhets 80fd5b67fc Merge branch 'ce_non_conflict' into 'master' 
CE upstream

See merge request !305
 2015-02-06 17:40:58 +00:00
Valery Sizov 45ec0d255d Merge remote-tracking branch 'ee/master' into ce_non_conflict 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
 2015-02-05 22:01:05 -08:00
Valery Sizov bc57ff0ef0 Merge branch 'refactor_import' into 'master' 
GitHub importer refactoring

See merge request !1477
 2015-02-06 05:51:02 +00:00
Valery Sizov b3c90dd514 GitHub importer refactoring 2015-02-05 21:48:21 -08:00
Dmitriy Zaporozhets 85c2cb2a19 Merge branch 'submit-comment-on-command-enter' into 'master' 
Submit comment on command enter

Fixes #1869.

See merge request !1474
 2015-02-06 03:46:25 +00:00
Dmitriy Zaporozhets ff6a5fb31b Merge branch 'remove-group-milestone-participants-duplicates' into 'master' 
Remove duplicates from group milestone participants list.

See merge request !1473
 2015-02-06 03:38:05 +00:00
Valery Sizov 411bf8ca08 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-05 18:06:00 -08:00
Dmitriy Zaporozhets e19bac4caf Merge branch 'gitlab_importer' into 'master' 
Gitlab.com integration && Gitlab importer

#1933

See merge request !1456
 2015-02-06 02:02:08 +00:00
Valery Sizov 1ac20698a5 gitlab.com importer: refactorig 2015-02-05 17:03:43 -08:00
Douwe Maan 71668312c4 Submit comment on command-enter. 
Fixes #1869.
 2015-02-05 21:56:25 +01:00
Valery Sizov 2d5765bd2c gitlab.com importer: fix specs after refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 93585661b1 code folding 2015-02-05 12:50:34 -08:00
Valery Sizov 3d943d966d update changelog 2015-02-05 12:50:34 -08:00
Valery Sizov 592ed8738c Gitlab.com integration: code folding 2015-02-05 12:50:34 -08:00
Valery Sizov 33349dd549 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 713bc152bd GitLab.com integration: small view fix 2015-02-05 12:50:34 -08:00
Valery Sizov 18231b0bb3 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 7ddba92a39 Gitlab integration: added tests 2015-02-05 12:50:34 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08:00
Douwe Maan 58ecb06f74 Remove duplicates from group milestone participants list. 2015-02-05 21:26:57 +01:00
Jeroen van Baarsen eb39022674 Merge pull request #8318 from bbodenmiller/patch-9 
add editor command to update database.yml; cleanup
 2015-02-05 20:05:30 +01:00
Dmitriy Zaporozhets 0a9cab4ee6 Merge branch 'dont-download-image-attachments' 
Conflicts:
	CHANGELOG
 2015-02-05 09:54:38 -08:00
Dmitriy Zaporozhets 50e8e5943f Merge branch 'redirect-sign_up' into 'master' 
Redirect signup page to signin page.

Resolves #1916.

See merge request !1468
 2015-02-05 16:47:11 +00:00
Douwe Maan 8efed8b356 Update changelog. 2015-02-05 16:02:06 +01:00
Douwe Maan ab22caa97e Redirect signup page to signin page. 
Resolves #1916.
 2015-02-05 15:56:28 +01:00
Dmitriy Zaporozhets cb8b5c321f Merge branch 'ce-into-ee' into 'master' 
CE into EE

See merge request !303
 2015-02-05 06:00:01 +00:00
Dmitriy Zaporozhets 96a3f0e0a8 Fix rubocop issues 2015-02-04 18:26:41 -08:00
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee 
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
 2015-02-04 18:19:22 -08:00
Dmitriy Zaporozhets 31323205bc Merge branch 'reserverd-project-names' into 'master' 
Disable reserverd project names

Fixes #1550

See merge request !1471
 2015-02-05 01:00:34 +00:00
Dmitriy Zaporozhets d8cb235195 CHANGELOG updated with project na,es blacklist 2015-02-04 16:57:55 -08:00
Dmitriy Zaporozhets 0e2fcb68d7 Disable project path blacklist 
Because since project always belongs to namespace it dont need such
strict restrictions any more
 2015-02-04 15:23:38 -08:00
Dmitriy Zaporozhets 3a533d48c6 Merge branch 'font-variable' into 'master' 
Removes the hard-coded font in the diff notes

Removes the hard-coded font in the diff notes and switches to using the $regular_font variable.

See merge request !259
 2015-02-04 23:06:26 +00:00
Dmitriy Zaporozhets c2c1630905 Merge branch 'fix/groupsearch' into 'master' 
Fix group search to check path as well as name

The API documentation says:

"You can search for groups by name or path with: /groups?search=Rails"

But you can't because the search query only checks the name, not the path. This fixes that.

See merge request !325
 2015-02-04 23:01:52 +00:00
Dmitriy Zaporozhets a4372ab6ff Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-04 14:58:15 -08:00
Dmitriy Zaporozhets 986c5b6f87 Merge branch 'foo-barred' into 'master' 
Fix the intermittently failing "Bar" search tests.

Over the past several months we've come to calling them the foobarred tests. We've seen them fail on our jenkins server, and on the GitLab semaphore tests.

In this merge request I scope the test checks for the foo barred tests to check within the .search-results div.

Fixes #567

See merge request !258
 2015-02-04 22:57:41 +00:00
Dmitriy Zaporozhets 028b58a987 Merge pull request #8449 from choppsv1/ipv6_addr_fix 
Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git")
 2015-02-04 14:51:06 -08:00
Dmitriy Zaporozhets 72db0c4dc0 Merge pull request #8395 from sbeh/master 
Socket [::]:123 on Linux listens on IPv4 and IPv6
 2015-02-04 14:49:08 -08:00
Dmitriy Zaporozhets 60b80541cd Merge pull request #8726 from jvanbaarsen/sidebar-colors-comment 
Also show colors in the sidebar of comment
 2015-02-04 14:47:57 -08:00
Dmitriy Zaporozhets fc13ea7137 Merge pull request #8712 from jvanbaarsen/add-merge-request-files-endpoint 
Added a way to retrieve MR files
 2015-02-04 14:46:54 -08:00
Dmitriy Zaporozhets 61d07eabfc Fix tests 2015-02-04 13:54:19 -08:00
Marin Jankovski 6ca23357c4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-04 09:12:02 -08:00
Marin Jankovski d685d45222 Merge branch 'consolidate_ssh_docs' into 'master' 
Consolidate SSH docs

The two available SSH topics were quite short, so it made sense to combine them.

Includes fixes a few missing words, punctuation.

See merge request !328
 2015-02-04 17:11:38 +00:00
Ewan Edwards 7aa3f6053e Consolidate the SSH topics into a single file, since the two 
available topics are quite short.

Also correct some missing words, punctuation.
 2015-02-04 08:23:24 -08:00
Douwe Maan f4ce0ddde4 Show image attachments in browser instead of downloading them. 
Resolves #1702.
 2015-02-04 15:35:10 +01:00
Jacob Vosmaer 46a4d371b6 Merge pull request #8661 from limansky/master 
Fixes #8478. Update timfel-krb5-auth to 0.8.2.
 2015-02-04 13:37:33 +01:00
Jeroen van Baarsen b60d06eb2c Added a way to retrieve MR files 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-04 10:24:25 +01:00
Marin Jankovski 56a456b43d Merge branch 'doc_cookbook_uses_omnibus' into 'master' 
Drop comments on cookbook installing from source now that it uses Omnibus.

gitlab-coockbook now uses Omnibus packages so raketasks are invoked via gitlab-rake

See merge request !318
 2015-02-04 05:28:10 +00:00