home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,994 Commits 48 Branches 340 Tags
be150fa9913d760802dc4c673ed59930f03ffec0
Commit Graph
413 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 28e13634dc Merge branch 'improve/mr_diff' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/project_fork.rb
	features/steps/project/project_forked_merge_requests.rb
	features/steps/project/project_issue_tracker.rb
	features/steps/project/project_markdown_render.rb
	features/steps/shared/project.rb
 2014-01-23 14:38:23 +02:00
Dmitriy Zaporozhets 418660b971 Fix public tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 13:05:34 +02:00
Dmitriy Zaporozhets c3270875ed Fix project team tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 13:02:43 +02:00
Dmitriy Zaporozhets 380342784d Fix MR spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 12:55:43 +02:00
Dmitriy Zaporozhets 4d56c359d3 Merge pull request #6075 from skv-headless/remove_deprecated_finders 
Remove deprecated finders
 2014-01-22 11:04:56 -08:00
Dmitriy Zaporozhets c227aa44f9 Make changes to tests 
* project_with_code -> project
* project -> ermpty_project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 21:03:52 +02:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
Dmitriy Zaporozhets 4e2c34d81b Test hook properly 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 16:38:48 +02: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 8b513fbc50 Improve side filters and make them look similar 2014-01-14 13:51:59 +02: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
Jeroen van Baarsen 2eb1220f67 Removed expiration from snippets 
* Removed the expiration from the project snippets
* Fixed the layout for the project snippets
 2014-01-11 18:24:20 +01:00
Dmitriy Zaporozhets 04ad19dc5c Include missing helper for project_forked_merge_requests tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 16:05:41 +02:00
Dmitriy Zaporozhets 54b908afb7 Remove include of un-existing helper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 15:45:29 +02:00
Dmitriy Zaporozhets 047a76009a Remove chosen from tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 15:35:39 +02:00
Dmitriy Zaporozhets a6da154ed3 Fix group test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-05 22:12:03 +02:00
Dmitriy Zaporozhets ac6c050773 Fix network tests. Removed console.log 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-05 13:41:09 +02:00
Dmitriy Zaporozhets a81002d920 Fix wiki tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-02 13:11:52 +02:00
Dmitriy Zaporozhets 21b028b548 Improve tests and make preview for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 23:21:26 +02:00
Dmitriy Zaporozhets 1a2e11c891 Fix per-project counters for Dashboard filters 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 09:19:51 +02:00
Dmitriy Zaporozhets b1970e0cf1 Tests for Dashboard#issues filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-24 19:04:57 +02:00
Dmitriy Zaporozhets 4c61c46738 Add tests to Dashboard#merge_requests filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-24 18:22:48 +02:00
Dmitriy Zaporozhets b8b8a34b52 Fix 500 error when rename repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 13:19:13 +02:00
Andrew Tomaka 0760ba3efb Customization and previewing of broadcast messages 2013-12-18 17:43:45 -05:00
Dmitriy Zaporozhets 078b3f580e Rename Services to Project services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:27:52 +02:00
Dmitriy Zaporozhets 79248f4ca5 Merge pull request #5866 from jhollingsworth/fix/default-public-pull-url 
Update default public pull url.
 2013-12-18 04:41:06 -08:00
Jason Hollingsworth 1521f467cb Update default public pull url. 
This updates the default pull URL for public projects when the user
is not logged in.
 2013-12-17 12:48:59 -06:00
Dmitriy Zaporozhets 68f8ffb551 Add spinach tests for email on push service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 16:29:08 +02:00
Steven Thonus 37383966ef Archiving old projects; archived projects aren't shown on dashboard 
features for archive projects
abilities for archived project
other abilities for archive projects

only limit commits and merges for archived projects

ability changed to prohibited actions on archived projects

added spec and feature tests for archive projects

changed search bar not to include archived projects
 2013-12-16 14:39:14 +01:00
Dmitriy Zaporozhets f3d5b565d5 fix profile tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:29 +02:00
Dmitriy Zaporozhets a885c68781 Require rspec expectations into spinach 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:27 +02:00
Jason Hollingsworth c099074fcc Fix 404 on project page for unauthenticated user 
Eliminate a 404 error when user is not logged in and attempts to visit
a project page.

The 404 page will still show up when user is logged in and the project
doesn’t exist or the user doesn’t have access.
 2013-12-04 13:10:20 -06:00
Drew Blessing b08608b261 Issue 5716 - Allow removal of avatar 
Add class and style

Add spinach tests

Add entry to CHANGELOG

Add entry to CHANGELOG
 2013-12-02 16:20:34 -06:00
Dmitriy Zaporozhets dc29b23733 Merge pull request #5725 from Popl7/http_repo_link_on_public_acces 
Correct url to pull puplic repos anonymously on project page
 2013-12-01 23:33:21 -08:00
Sytse Sijbrandij 7f3ff69e3e Merge pull request #5737 from Popl7/type_fix_for_project_network_graph 
type_fix_for_project_network_graph
 2013-12-01 03:10:16 -08:00
Steven Thonus e3d4eb2140 type_fix_for_project_network_graph 2013-11-30 17:27:02 +01:00
Steven Thonus 5907207e4d showing as default http link for public repo when anonymous 2013-11-29 09:32:34 +01:00
Dmitriy Zaporozhets db0c353a78 Merge pull request #5708 from jhollingsworth/feature/multiline-blob-select 
Enable multiline select for blobs.
 2013-11-29 00:18:34 -08:00
Dmitriy Zaporozhets 2e07865f16 Merge remote-tracking branch 'origin/side-by-side' 
Conflicts:
	CHANGELOG

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-28 19:26:21 +02:00
Jason Hollingsworth 568e05a73b Enable multiline select for blobs. 
Holding shift will allow users to click and select multiple lines.
The behavior is similar to GitHub.
Complete with tests.
 2013-11-27 20:08:37 -06:00
Sytse Sijbrandij 68726c5bb4 Button name has an upcase in it. 2013-11-27 17:57:55 +01:00
Sytse Sijbrandij ca1526e7ff Conventional naming for diff modes. 2013-11-27 09:00:14 +01: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 b51c2c8118 Merge pull request #5308 from Popl7/parallel-diffs-side-by-side 
diff view on commit with parallel diff view
 2013-11-26 03:31:42 -08: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
Carlos Paramio 4db87f7c4b Integration with Assembla 2013-11-21 13:18:02 +01:00
Dmitriy Zaporozhets 8841eec426 Improve snippets UX 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-18 21:34:07 +02:00
Steven ThonusandSteven Thonus 856d4088fb diff view on commit with parallel diff view 
TODO: fix comment forms to respect left and right columns
 2013-11-17 16:35:34 +01:00
Dmitriy Zaporozhets 3397361fd7 Spinach test for broadcast messages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 18:56:48 +02:00