home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,221 Commits 48 Branches 340 Tags
4091322dba7ee3b94de9ad0b8b061622ba1e468c
Commit Graph
1109 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets fa7d62494a Merge branch 'authenticated_public_mode' of https://github.com/jhollingsworth/gitlabhq into feature/internal_projects 
Conflicts:
	app/models/project.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-27 11:51:46 +02:00
Dmitriy Zaporozhets 44c55307a0 Use 1.9 hash syntax for some tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-27 10:04:00 +02:00
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal). 
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
 2013-11-26 22:22:07 -06:00
Dmitriy Zaporozhets 02d8c00323 Fix session spec because of password length 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-25 22:33:04 +02:00
Dmitriy Zaporozhets ec630ffc3b More fixes to test because of long password 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-25 21:36:17 +02:00
Dmitriy Zaporozhets 58601ebdab Fix tests after user password length was changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-25 20:07:55 +02:00
Dmitriy Zaporozhets f539c8a306 Fix markdown tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-25 17:41:02 +02:00
Dmitriy Zaporozhets 4a1dc73264 Merge pull request #5661 from jasonblanchard/sorting-project-issues 
Added sorting to project issues page
 2013-11-23 12:10:58 -08:00
Jason Blanchard b76948e6c9 Added sorting to project issues page 2013-11-23 15:04:50 -05:00
Carlos Paramio 4db87f7c4b Integration with Assembla 2013-11-21 13:18:02 +01:00
Dmitriy Zaporozhets fd6e51612e Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 19:27:49 +02:00
Dmitriy Zaporozhets 3bab1bd4c1 Improve consistency: use file_path for API create/update/delete files 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 10:03:50 +02:00
Dmitriy Zaporozhets a185cce5d3 Tests for delete file by API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:36:11 +02:00
Dmitriy Zaporozhets ba169cc52d API: projects/all tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-18 16:42:56 +02:00
Dmitriy Zaporozhets 9340d4887f Namespaces api specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-15 15:29:53 +02:00
Dmitriy Zaporozhets 201d489780 Annotate 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-13 14:10:03 +02:00
Dmitriy Zaporozhets bd2ca33d58 Merge branch 'relative' of /home/git/repositories/gitlab/gitlabhq 2013-11-12 18:14:44 +00:00
Marin Jankovski 4e9284a023 Clear state in test satellite dir. 2013-11-12 15:11:46 +01:00
Dmitriy Zaporozhets c5b667351a Show broadcast message to users 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 15:08:20 +02:00
Dmitriy Zaporozhets f1ecf53c1e Broadcast message model + migrations 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 13:47:28 +02:00
Dmitriy Zaporozhets c77d957b36 API: Edit file in repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-11 14:58:06 +02:00
Dmitriy Zaporozhets ca196453f0 Merge branch 'feature/api_create_file' of /home/git/repositories/gitlab/gitlabhq 2013-11-09 09:42:29 +00:00
Dmitriy Zaporozhets ea3680ad80 Merge pull request #5571 from bke-drewb/email 
Fix minor errors/annoyances in email templates
 2013-11-08 23:59:27 -08:00
Dmitriy Zaporozhets 4b98597edc Add specs for Email confirmation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-08 18:29:26 +02:00
Drew Blessing 57ad81a9c5 Fix minor errors/annoyances in email templates 
There was some funny syntax in merge request email templates. There was a ! before
the merge request number when there probably should be a #. This may be some carry over
from markdown but should not be in email templates.  There were also some capitalization
discrepancies among the subject lines. For those OCD people out there I standardized the
capitalization. :)
 2013-11-08 10:20:15 -06:00
Dmitriy Zaporozhets e8bb32e623 Specs for Create file API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-07 18:53:35 +02:00
Dmitriy Zaporozhets cfa15d0846 Remove default_branch support from API project creation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 19:14:11 +02:00
Dmitriy Zaporozhets 580dfe5af9 Replace assign with stub for default_branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 19:13:45 +02:00
Dmitriy Zaporozhets b813a4888a Remove User#namespaces method from code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 17:15:43 +02:00
Dmitriy Zaporozhets f9b66aecdd Revert "More escaping" 
This reverts commit c46eaca912.
 2013-11-05 15:35:49 +02:00
Jacob Vosmaer 71f34f77b3 Merge pull request #5500 from nkukard/esc-strings2 
More escaping
 2013-11-05 00:30:45 -08:00
Nigel Kukard c46eaca912 More escaping 
- Database name may contain characters which are not shell friendly
- Database password could contain the same
- While we at it there is no harm in escaping generated paths too
- Refactored 2-line system(command)

Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
 2013-11-04 22:09:03 +00:00
Johannes Schleifenbaum d9deb24f3a Preselect the current issue tracker with selected="selected" 
The previous behavior was, that the first element of the select was
preselected, thus upon saving the project, the previous selected could
be overwritten.
 2013-11-01 15:33:47 +01:00
Dmitriy Zaporozhets a27e4404db Merge pull request #5435 from karlhungus/feature_search_namespace_name_and_public 
Allow searching by namespace name, include public projects
 2013-10-31 10:57:51 -07:00
Dmitriy Zaporozhets d636ad49bf API: set gitlab-ci service for project 2013-10-29 16:39:46 +02:00
Izaak Alpert 0f87ae3be5 Allow searching by namespace name, include public projects 
GITLAB-1457 (GITLAB-836)

Change-Id: If8e2474bc6908accca51f395f58937687f101b58
 2013-10-24 11:23:26 -04:00
Peter Fern 05c988419f Expand refs constraints to include valid characters 
Fixes #4831, #4865, #4932
 2013-10-24 16:31:15 +11:00
Robert Speicher ae4a20133f Add specs for NotificationsHelper 2013-10-20 23:58:38 -04:00
Dmitriy Zaporozhets 9f7757ed24 Fix rspec test after bdd3513f03 2013-10-20 18:29:11 +03:00
Robert Speicher cb9cf077de Refactor and cover search_autocomplete_source 2013-10-20 01:05:20 -04:00
Robert Speicher bb494203d2 Cover the simple_sanitize helper 2013-10-19 23:57:34 -04:00
Dmitriy Zaporozhets ec337276c6 Merge branch 'issue_tracker' of /home/git/repositories/gitlab/gitlabhq 2013-10-17 12:58:15 +00:00
Marin Jankovski ff046c7200 Fallback to internal issue tracker if config is invalid. 2013-10-17 10:42:39 +02:00
Dmitriy Zaporozhets 7b70d81c83 Speed up tests 2013-10-17 10:52:38 +03:00
Angus MacArthur aefe2e952f Fixing unsafe use of Thread.current variable :current_user 2013-10-16 01:20:53 -04:00
Dmitriy Zaporozhets f4d68f398f set current_user for project spec 2013-10-15 11:29:22 +03:00
Dmitriy Zaporozhets 2e8b0fa5cf Oauth users and users created by admin should be confirmed immediatly 2013-10-15 09:59:58 +03:00
Dmitriy Zaporozhets 18a6f31b6a Merge branch 'feature/api_iids' of /home/git/repositories/gitlab/gitlabhq 2013-10-14 15:24:17 +00:00
Dmitriy Zaporozhets d20db103c1 Merge branch 'readding_group_member' of /home/git/repositories/gitlab/gitlabhq 2013-10-14 14:41:13 +00:00
Dmitriy Zaporozhets 12800e5445 Extend API Issues, MergeRequets, Milestones with iid field 2013-10-14 16:39:54 +03:00