home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,913 Commits 48 Branches 340 Tags
f59fe341dec81f3d90fd91ea19fb28318445f6fd
Commit Graph
4295 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3628eb84c4 Merge pull request #6072 from jvanbaarsen/fix-3516 
Better check on the validity of emails
 2014-01-19 10:29:06 -08:00
Dmitriy Zaporozhets f8aae4b7d8 Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-01-19 20:23:29 +02:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
Dmitriy Zaporozhets 712a2ec4fd Case-insensetive search autocomplete for projets 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 16:22:57 +02:00
Dmitriy Zaporozhets 757e92d52e Prevent duplicate method names in helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 16:06:20 +02:00
Dmitriy Zaporozhets 073a269831 Refactor search autocomplete. Use ajax for source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 14:16:46 +02:00
Dmitriy Zaporozhets f0d2d28118 Merge branch 'refactoring/context_into_services' into 'master' 
Refactoring context Into services

To prevent confusion where to write logic. Context or Service?
 2014-01-17 09:47:47 +00:00
Dmitriy Zaporozhets 4d82e9ed0b Fix require for file services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 20:36:51 +02:00
Dmitriy Zaporozhets 1c4870c54a Fix encoding pass to edit file satellite 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 19:31:12 +02:00
Dmitriy Zaporozhets 1d2bdb4d58 Move all Context classes into Services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 19:03:42 +02:00
Dmitriy Zaporozhets 8f0a97da04 Add base64 encoding selector to new file UI so you can add image to repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 18:25:32 +02:00
Dmitriy Zaporozhets 7001ad2dda Add files encoding support on context level 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 18:10:35 +02:00
Jeroen van Baarsen 05e4af5b4c Better check on the validity of emails 
At this moment it was possible to enter emails like:
mailto:info@example.com. This was causing some issue in the frontend,
since those links became html mailto: links.

Fixes: #3516
 2014-01-16 12:14:47 +01:00
Dmitriy Zaporozhets de68dd2601 Merge pull request #6062 from skv-headless/fix_n+1_user_page 
fix n+1 problem for namespaces
 2014-01-16 02:28:01 -08:00
Dmitriy Zaporozhets 5437c3ea1e Merge branch 'new-branch-usability' into 'master' 
Improve usability of new branch form
 2014-01-16 10:22:00 +00:00
Dmitriy Zaporozhets e3f436dc43 Merge branch 'refactoring/issues_filter' into 'master' 
Refactoring: Issues/MR filtering logic

Move all issues, mr filtering logic into FilteringService
 2014-01-16 10:21:21 +00:00
Dmitriy Zaporozhets 206741f0a3 Merge branch 'webhook_verify_none' into 'master' 
Disable SSL peer verification for all webhooks

SSL peer verification was silently enabled by the HTTParty upgrade in 8a54fda459.
This patch restores the previous behaviour of GitLab 6.3 and earlier.
 2014-01-16 10:13:00 +00:00
dosire d015bb322f New branch doesn't exist yet. 2014-01-16 11:05:55 +01:00
Dmitriy Zaporozhets 974281d140 FilteringService works with scope :all event if current user is not defined 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 11:40:33 +02:00
Dmitriy Zaporozhets 4e96b1759c Merge branch 'refactoring/services' of /home/git/repositories/gitlab/gitlabhq 2014-01-15 18:43:30 +00:00
dosire 92c5682268 Replace hints with text that is obviously not valid. 2014-01-15 16:16:07 +01:00
Dmitriy Zaporozhets 46997c6a89 Remove unnecessary contexts 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 16:32:56 +02:00
Dmitriy Zaporozhets 234b86c97f Use FilteringService for project issuus, mrs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 16:32:44 +02:00
Jacob Vosmaer 5ae0d61d0a Disable SSL peer verification for all webhooks 
SSL peer verification was silently enabled by the HTTParty upgrade in
8a54fda459. This patch restores the
previous behaviour of GitLab 6.3 and earlier.
 2014-01-15 15:29:22 +01:00
Dmitriy Zaporozhets 6153aa1360 Use FilteringService for Dashboard, Group pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 16:16:45 +02:00
Dmitriy Zaporozhets 5e96ee341c Implement FilteringService 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 16:16:23 +02:00
Dmitriy Zaporozhets 7bcd112a29 Fix commit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 15:31:49 +02:00
Dmitriy Zaporozhets f19cdee8cc Remove commit_load_context.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 15:06:12 +02:00
Dmitriy Zaporozhets 8bfc62fb8b Convert TestHookContext into TestHookService. Added tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 14:38:50 +02:00
Dmitriy Zaporozhets 37ef33cba1 Use instance methods for system_hooks_service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 14:26:05 +02:00
Dmitriy Zaporozhets 2e7abbd66c Move repo rename email to notification service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 14:03:52 +02:00
skv 2f55d0b6be fix n+1 problem for namespaces 2014-01-15 15:23:47 +04:00
Dmitriy Zaporozhets 38d8d749d7 Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq 2014-01-15 10:36:12 +00:00
Dmitriy Zaporozhets 3efbdbfda6 Increase max height of select2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 21:52:39 +02:00
Dmitriy Zaporozhets eba8aa742c More styling to select2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 21:45:20 +02:00
Dmitriy Zaporozhets ea9ea3fe92 Move sort dropdown to the right 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 21:15:17 +02:00
Dmitriy Zaporozhets e19d05ddd6 Fix issues selects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 21:07:59 +02:00
Dmitriy Zaporozhets 2940785c17 Add sort dropdown to merge requests list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:55:59 +02:00
Dmitriy Zaporozhets 2c071314ae Move issues sort dropdown to shared partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:55:42 +02:00
Dmitriy Zaporozhets b85e4d3cbd Move issues sort logic to Issuable concern 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:49:32 +02:00
Dmitriy Zaporozhets 0c637acb69 Add login and remember_me to devise permit list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:28:41 +02:00
Dmitriy Zaporozhets 688af57da0 Increase width of issue filter field 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:27:19 +02:00
Dmitriy Zaporozhets 2e79f83071 Add hr below mr title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:23:56 +02:00
Dmitriy Zaporozhets 99a2b31e98 Dont allow merge without commit message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 19:56:52 +02:00
Dmitriy Zaporozhets 8b513fbc50 Improve side filters and make them look similar 2014-01-14 13:51:59 +02:00
Dmitriy Zaporozhets 5a52c9b0a6 Merge pull request #6038 from jvanbaarsen/fix-5767 
Fix for #5767
 2014-01-14 02:55:54 -08:00
Dmitriy Zaporozhets 9247490109 Tests for accept MR with custom message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 11:49:54 +02:00
Dmitriy Zaporozhets 09d5868c22 Fix mr controller specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 10:47:28 +02:00
Daniel Lukasiak 6ecda0f405 Set correct data-original-title value for my snippets 2014-01-14 15:09:20 +07:00
Jeroen van Baarsen d5bb466fe4 Fix for #5767 
In the branch graph, uploaded images where not rendered
correctly. Fixed this by not filling the rect, instead
i've put an image over it
 2014-01-13 22:22:46 +01:00