home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,743 Commits 48 Branches 340 Tags
c0d2b976caa8bacd3a1fb90337eb2ddcbee93c8e
Commit Graph
8743 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets c0d2b976ca Restore old travis.yml 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 13:29:51 +02:00
Dmitriy Zaporozhets 36c094b08d Merge branch 'gmessner/gitlab-ce-issue-110' 2014-03-16 09:43:41 +02:00
Dmitriy Zaporozhets fddbd7b2f0 Merge branch 'issue-110' of https://gitlab.com/gmessner/gitlab-ce into gmessner/gitlab-ce-issue-110 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-03-16 09:43:25 +02:00
Dmitriy Zaporozhets f3220ababb Merge branch 'dev-seeds' into 'master' 
Improve developer seeds
 2014-03-16 07:40:34 +00:00
Dmitriy Zaporozhets 39f80884db Improve developer seeds 
Return execution of observers in seeds.
Mute email sending to letter opening in you browser.
Added `rake dev` task to reset db and add seeds.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-15 11:39:35 +02:00
Dmitriy Zaporozhets 6e73b208a9 Add comments fixtures for development 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-15 10:23:48 +02:00
Dmitriy Zaporozhets ecae936d34 Merge branch 'batch_key_import' into 'master' 
Batch Key Import
 2014-03-15 06:28:44 +00:00
Dmitriy Zaporozhets 66a484c9cd Merge branch 'improve-project-lookup' into 'master' 
Improve Project Lookup

Fixes #1080
 2014-03-15 06:27:15 +00:00
Dmitriy Zaporozhets 7c5320d2c8 Merge branch 'snippets-page' into 'master' 
Render 404 instead of 500 if trying to see snippets of unexisting user

Fixes #1087
 2014-03-14 21:10:12 +00:00
Dmitriy Zaporozhets f84d015fa9 Fix commit comment count css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 23:09:43 +02:00
Jacob Vosmaer 090ed21e6f Batch key import requires gitlab-shell 1.8.5 2014-03-14 15:58:47 +01:00
Jacob Vosmaer 779fa4a7b7 Use batch_add_keys in rake gitlab:shell:setup 2014-03-14 15:49:11 +01:00
Dmitriy Zaporozhets a9f2903e86 Change project lookup order for api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 15:58:52 +02:00
Dmitriy Zaporozhets 25f68a71d6 Project must have namespace for Project#find_with_namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 15:58:10 +02:00
Dmitriy Zaporozhets a39eeba1dc Render 404 instead of 500 if trying to see snippets of unexisting user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 15:55:41 +02:00
Dmitriy Zaporozhets 17a9ecf8cf Remove confusing code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 14:43:50 +02:00
Dmitriy Zaporozhets e07b2f527f Fix global search 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 14:41:28 +02:00
Dmitriy Zaporozhets 02b310dffb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-03-14 14:23:42 +02:00
Dmitriy Zaporozhets fa3c087a4c Clear rake task only if defined 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 14:23:28 +02:00
Dmitriy Zaporozhets 00815dd4a2 Merge branch 'new_lines_markdown' into 'master' 
New Lines Behaviour in Markdown

Per markdown specification, only render line-breaks when you end a line with two or more spaces.
 2014-03-14 12:16:44 +00:00
Marin Jankovski ccc14fa21c Add to changelog changes for markdown. 2014-03-14 12:33:22 +01:00
Marin Jankovski f3ceebad42 Ignore newlines per md standard. 2014-03-14 12:33:03 +01:00
Dmitriy Zaporozhets b5d81174fb Fix mr process order on push. 
First close merge requests that being merged. Then update code of open
mr. This fixes bug when MR merged via command line lose their diff
because code reload was before MR close.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 13:02:55 +02:00
Dmitriy Zaporozhets 1ec106b853 Merge branch 'ldap_connections' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-03-14 12:58:43 +02:00
Dmitriy Zaporozhets bce8edbbcc Require gitlab-shell v1.8.4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 12:57:26 +02:00
Dmitriy Zaporozhets f0a417df38 Merge branch 'dzaporozhets/gitlabhq-import-timeout' 2014-03-14 12:53:18 +02:00
Dmitriy Zaporozhets ac6b9fafdc Fix specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 12:53:05 +02:00
Dmitriy Zaporozhets b007cadf55 Fix project creation test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 12:19:02 +02:00
Dmitriy Zaporozhets 0d7986a8c7 Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	db/schema.rb
 2014-03-14 12:00:21 +02:00
Dmitriy Zaporozhets 58e4e6b081 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-14 11:06:48 +02:00
Dmitriy Zaporozhets 8839339ee3 Override rake test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 11:06:10 +02:00
Dmitriy Zaporozhets cad79433c4 Merge pull request #6526 from mavimo/patch-1 
Fixed error on mysql install link
 2014-03-14 11:03:48 +02:00
Dmitriy Zaporozhets 9b36941fce Merge pull request #6527 from tsigo/quieter-test-output 
Quieter test output
 2014-03-14 11:03:29 +02:00
Dmitriy Zaporozhets f6f80659ec Override rake spec and rake spinach tasks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 10:44:16 +02:00
Jacob Vosmaer 48e9054056 Open/close LDAP in ApplicationController 
By opening the LDAP connection at the controller level we can reuse it
for all LDAP queries during the request.
 2014-03-14 09:03:49 +01:00
Jacob Vosmaer 56df3dbff2 Add Gitlab::LDAP::Access.open 
This new method wraps Gitlab::LDAP::Adapter.open to enable connection
reuse.
 2014-03-14 08:55:50 +01:00
Jacob Vosmaer af53aa9072 Add Gitlab::LDAP::Adapter.open 
This new method is based on Net::LDAP.open, which reuses a single LDAP
connection.
 2014-03-14 08:53:46 +01:00
Jacob Vosmaer 5a616649b5 Allow passing an adapter to Gitlab::LDAP::Person 2014-03-14 08:52:57 +01:00
Robert Speicher 0983438037 TestEnv.reset_satellite_dir should run 'git clean' quietly 
Removes the "Removing gitlabhq" messages cluttering spec output
 2014-03-13 17:25:55 -04:00
Dmitriy Zaporozhets 506709485c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-13 23:20:02 +02:00
Dmitriy Zaporozhets 632fe8fbe1 Update changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 23:19:50 +02:00
Dmitriy Zaporozhets 65cb88f3ba Correct BackgroundJobs page for both OSX and linux 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 23:15:33 +02:00
Dmitriy Zaporozhets 2a7da96a0d Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/stylesheets/sections/commits.scss
	app/assets/stylesheets/sections/notes.scss
	app/views/projects/commits/_diffs.html.haml
	features/steps/project/merge_requests.rb
 2014-03-13 23:11:16 +02:00
Marco Vito Moscaritolo 599ee9670d Fixed error on mysql install link 
Fixed error on install guide to mysql conf page.
 2014-03-13 22:04:36 +01:00
Dmitriy Zaporozhets 6f5a9b4110 Merge pull request #6360 from jvanbaarsen/fix-6328-expose-username 
Also expose username for the /discover endpoint
 2014-03-13 22:40:01 +02:00
Dmitriy Zaporozhets c8e1c53f43 Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn into cirosantilli-rm-dir-prefix 2014-03-13 22:36:39 +02:00
Dmitriy Zaporozhets 3f2d94105b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-13 22:36:08 +02:00
Dmitriy Zaporozhets 88742aea68 Merge pull request #6523 from jvanbaarsen/patch-4 
Added entry for the new webhook
 2014-03-13 22:33:08 +02:00
Dmitriy Zaporozhets 3082d2a4be Merge branch 'tighten_logrotate' into 'master' 
Tighten Logrotate
 2014-03-13 20:07:57 +00:00
Dmitriy Zaporozhets 42ef81be54 Merge branch 'patch_update_robustness' into 'master' 
Patch Update Robustness
 2014-03-13 20:07:19 +00:00