home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,615 Commits 48 Branches 340 Tags
eff30fff08cf7326d4416d1aa6ef00164643cdcb
Commit Graph
9615 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets eff30fff08 Improve dn_matches_filter method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-15 17:27:59 +03:00
Dmitriy Zaporozhets 1fe677995c LDAP::Adapter#ldap_search method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-15 16:50:31 +03:00
Dmitriy Zaporozhets 4bcc244bc2 Merge branch 'proper-brand-logo' into 'master' 
Proper brand logo

 Use new properly aligned logo on transparent background.
 2014-04-15 10:35:31 +00:00
dosire abb4f12743 Use new properly aligned logo on transparent background. 2014-04-15 10:59:26 +02:00
Dmitriy Zaporozhets 05b72f439b Merge branch 'brand-sign-in' into 'master' 
Brand sign in

Allows customise of login screen for admin users.

Fixes #66.
 2014-04-15 06:19:41 +00:00
Dmitriy Zaporozhets d78d04ee9d Mention new EE feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:16:16 +03:00
Dmitriy Zaporozhets a7680d7e3a Spinach feature for appearance 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:14:51 +03:00
Dmitriy Zaporozhets cfa7e24b33 Use last appearance settings. Show last edit date 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:14:51 +03:00
Dmitriy Zaporozhets c12695f1fb Add preview page for appearance settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:14:50 +03:00
Dmitriy Zaporozhets 4f8308178c Render appearance changes. Show appearance tab in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:14:50 +03:00
Dmitriy Zaporozhets 40104eead7 Appearance model for custom signin page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:14:50 +03:00
Dmitriy Zaporozhets b33da767cb Appearance scaffold 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:13:33 +03:00
Dmitriy Zaporozhets ef73898f18 Prototype branded sign-in page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:13:33 +03:00
Jacob Vosmaer f4610a8ce2 Merge branch 'packages/6-7-4' into 'master' 
Packages for EE 6.7.4
 2014-04-14 13:21:56 +00:00
Jacob Vosmaer c924bac949 Add packages for 6.7.4-ee 2014-04-14 15:19:07 +02:00
Dmitriy Zaporozhets 9436c506d4 Merge branch 'upstream-ce-6-8' into 'master' 
Upstream CE 6.8
 2014-04-11 06:11:01 +00:00
Jacob Vosmaer 4f5ec3a21f Merge branch 'ee-6.7.3-pkgs' into 'master' 
Ee 6.7.3 pkgs

I also updated the formatting a bit in the document.
 2014-04-10 15:15:45 +00:00
Job van der Voort 875556fd63 make archive easier to navigate 2014-04-10 16:27:03 +02:00
Job van der Voort a83b40b381 add 6.7.3-ee packages 2014-04-10 15:32:16 +02:00
Dmitriy Zaporozhets 89eabd305e Remove application.js 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-10 13:59:08 +03:00
Dmitriy Zaporozhets fae2e540b6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile.lock
	README.md
	VERSION
	app/assets/javascripts/application.js
	db/schema.rb
	doc/install/installation.md
	doc/update/4.2-to-5.0.md
	doc/update/5.0-to-5.1.md
	doc/update/5.1-to-5.2.md
	doc/update/5.2-to-5.3.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.0-to-6.7.md
	lib/gitlab/git_access.rb
 2014-04-10 13:34:56 +03:00
Thomas MoschnyandMarin Jankovski 5b123dbf7f Fix avatars in the network graph for relative-url setups. 2014-04-10 10:05:40 +02:00
Dmitriy Zaporozhets 5830d672f7 Merge branch 'no-link-to-centos-guide' into 'master' 
No link to centos guide
 2014-04-10 07:26:13 +00:00
Dmitriy Zaporozhets 6d761461d3 Merge branch 'email_update_test' into 'master' 
Email update test
 2014-04-10 07:23:53 +00:00
dosire 355b120224 Remove the vmi's. 2014-04-10 09:23:10 +02:00
dosire 549758b387 No capital letter for recommended. 2014-04-10 09:21:30 +02:00
Dmitriy Zaporozhets 89ecb19126 Merge branch 'ensure_default_fields' into 'master' 
Add values to default fields to prevent 500 error when migrate from MySQL to Postgres
 2014-04-10 07:20:45 +00:00
dosire 670e02982c Steer people to the packages since people encounter less errors installing those. 2014-04-10 09:20:19 +02:00
Dmitriy Zaporozhets 03472b4fc0 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-04-09 21:26:34 +03:00
Dmitriy Zaporozhets 7793417206 Fix note body align 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 21:26:11 +03:00
Dmitriy Zaporozhets 5c9127ea29 Merge pull request #6729 from hiroponz/fix-seed-fu 
Fix rake db:seed_fu ENV=development
 2014-04-09 21:23:25 +03:00
Dmitriy Zaporozhets fd8a165df7 Reduce note header padding 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 21:20:54 +03:00
Dmitriy Zaporozhets 67b07f96ea Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-04-09 21:16:50 +03:00
Dmitriy Zaporozhets 9f6a8ff4b5 Modify project default values 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 20:55:09 +03:00
Dmitriy Zaporozhets f23dcac91b Merge branch 'ensure_satellite_exists' into 'master' 
Ensure satellite exists instead of raising an error
 2014-04-09 17:50:26 +00:00
Dmitriy Zaporozhets 4e9add7c2c Merge branch 'clean_old_archives' into 'master' 
Clean old archives from repository downloads directory
 2014-04-09 17:50:09 +00:00
Dmitriy Zaporozhets fae6eb6353 Merge branch 'wiki-refactoring' into 'master' 
Wiki refactoring

Better names for variables and classes
 2014-04-09 17:48:46 +00:00
Marin Jankovski 63ba983511 Dont raise an error with satellites, make sure it exists. 2014-04-09 17:13:44 +02:00
Marin Jankovski 944ebb8e2e Add to clean archives to changelog. 2014-04-09 15:17:37 +02:00
Marin Jankovski b2959c4102 Remove archives older than 2 hours. 2014-04-09 15:09:11 +02:00
Dmitriy Zaporozhets 466f0fb762 Fix default value for project model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 15:05:40 +03:00
Dmitriy Zaporozhets 36f861f1b1 Re-annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 15:05:03 +03:00
Dmitriy Zaporozhets 1bd28994cc Use ProjectWiki instead of GollumWiki in code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 14:35:58 +03:00
Dmitriy Zaporozhets 26ec74c446 Refactor wiki model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 14:35:26 +03:00
Dmitriy Zaporozhets b27c42be87 Rename wiki variables 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 14:35:01 +03:00
Dmitriy Zaporozhets c5cdd07899 Add values to default fields to prevent 500 error when migrate from MySQL to Postgres 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 13:36:25 +03:00
Marin Jankovski 0cf7f2f85a Test update_email method. 2014-04-09 12:25:06 +02:00
Dmitriy Zaporozhets 71678f08f8 Merge branch 'issue_on_empty_repo' into 'master' 
Fix for error 500 on create issue for empty repo
 2014-04-09 10:11:45 +00:00
Jeroen van Baarsen f5b7899cf7 Typo fix in process.md 2014-04-09 11:38:33 +02:00
Marin Jankovski cf616a845b Do not require modernizr. 
Conflicts:
	app/assets/javascripts/main.js.coffee
 2014-04-09 09:46:17 +02:00