home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,916 Commits 48 Branches 340 Tags
522d754dfee9673befc7e6dc93c8a080eba7ae66
Commit Graph
621 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 522d754dfe Try wear_merged! without argument 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-01 11:43:16 +03:00
Marin Jankovski 65cb51af31 Add a feature for readme on project show page. 2014-09-30 14:59:30 +02:00
Robert Schilling 5b5912f917 Merge pull request #7889 from cirosantilli/rm-def-project 
Remove def project from tests that inherit it.
 2014-09-30 07:42:30 +02:00
Dmitriy Zaporozhets 8163a43c8f Merge pull request #7862 from cirosantilli/test-change-file 
Add web UI file CRUD tests.
 2014-09-29 17:38:22 +03:00
Dmitriy Zaporozhets 83a21c33f1 Add tests for commits graph 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 12:11:53 +03:00
Ciro Santilli a92f48f615 Remove def project from tests that inherit it. 2014-09-28 13:44:04 +02:00
Dmitriy Zaporozhets aa46a15d2a Fix spinach feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 18:12:25 +03:00
Ciro Santilli f456fce2a5 Add web UI file CRUD tests. 
me/ciro/bak/git/cirosantilli.com/web'
 2014-09-26 15:33:48 +02:00
Ciro Santilli 89f7345f3f Remove unnecessary page. from tests. 2014-09-26 09:51:17 +02:00
Robert Schilling b794fdbbbe Merge pull request #7838 from cirosantilli/evaluate-exec 
evaluate -> execute_script when return not needed.
 2014-09-24 10:28:15 +02:00
Ciro Santilli b9c2e6ebdc evaluate -> execute_script when return not needed. 2014-09-24 10:03:51 +02:00
Ciro Santilli 4e89860826 evaluate_script history -> go_back and go_forward. 2014-09-24 09:51:27 +02:00
Robert Schilling 6da15541d3 Merge pull request #7833 from cirosantilli/wiki-cur-url 
Factor current_url + URI.path into current_path.
 2014-09-23 22:14:17 +02:00
Ciro Santilli b095c1a44e Factor current_url + URI.path into current_path. 2014-09-23 21:56:38 +02:00
Ciro Santilli 778afb699f Replace javascript:; links with buttons. 2014-09-22 21:01:19 +02:00
Dmitriy Zaporozhets c31c8c55a4 Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/markdown_render.rb
 2014-09-22 20:56:12 +03:00
Dmitriy Zaporozhets fbdf34d7ab Merge pull request #7821 from cirosantilli/factor-spinach-classes 
[factor] Prefix Spinach features with Spinach::Features::.
 2014-09-22 20:54:37 +03:00
Dmitriy Zaporozhets 8cd882355e Merge branch '7-4-pre' into 'master' 
7.4 development

Development branch during `master` code freeze for 7.3

See merge request !1096
 2014-09-22 17:25:49 +00:00
Ciro Santilli de6c8778f7 Prefix Spinach features with Spinach::Features::. 2014-09-22 16:30:25 +02:00
Ciro Santilli ef6e94e37e Replace old spinach step definitions with step. 2014-09-22 10:01:50 +02:00
Ciro Santilli b65a2d07e4 Typo it -> its. 2014-09-21 19:45:54 +02:00
Dmitriy Zaporozhets 6485570482 Increase atom feed test coverage. Prevent 500 error if description is missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-20 11:55:58 +03:00
Dmitriy Zaporozhets fe314d460e Refactor coverage tools usage 
rspec spec # no coverage generated
SIMPLECOV=true rspec spec # generate coverage locally into ./coverage
COVERALLS=true rspec spec # generate and send coverage data to coveralls.io

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-19 16:39:56 +03:00
Dmitriy Zaporozhets aca574d0f4 Ask coveralls to merge results 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-19 13:07:58 +03:00
Dmitriy Zaporozhets 8bff9a4098 Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:41 +03:00
Dmitriy Zaporozhets 6dff16a679 Merge branch 'readme-anchor' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:22 +03:00
Dmitriy Zaporozhets d771253bdb Fix README anchor tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-17 20:37:41 +03:00
Dmitriy Zaporozhets 4f1bb91a75 Fix finder and tests for new membership models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 16:45:28 +03:00
Dmitriy Zaporozhets ce49f035cf Fix access_level api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:55:36 +03:00
Dmitriy Zaporozhets 79190fe06b Merge branch 'implement_comments_on_parallel_diff' into 'master' 
Implement comments on parallel diff

Fixes #1565

See merge request !1090
 2014-09-15 07:19:50 +00:00
Marin Jankovski 75fbca83e3 Add one feature test. 2014-09-12 20:12:31 +02:00
Marin Jankovski 1fd58c84a0 Merge pull request #7741 from Razer6/refactor/remove_duplicate_steps 
[Refactor] Remove duplicated labels step
 2014-09-12 19:03:47 +02:00
Robert Schilling 37a274a568 update tags count if tag gets deleted 2014-09-12 07:35:57 +02:00
Robert Schilling 8321a4d41f Remove duplicated labels step 2014-09-12 07:22:30 +02:00
Dmitriy Zaporozhets 5913f74446 Clickable labels feature test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-11 14:31:19 +03:00
Dmitriy Zaporozhets 9e4a40982e Merge pull request #7646 from bushong1/snippet-search3 
Adding in snippet search functionality
 2014-09-09 10:31:21 +03:00
Robert Schilling 7f7bf86bbf Change shortcut for activity to project, because navbar changed 2014-09-08 20:49:15 +02:00
Charles Bushong 4561a09c69 Cleaning for the hound 2014-09-05 13:51:23 -04:00
Charles Bushong 858dbd0842 Updating to persist a params snippets variable 2014-09-05 13:30:55 -04:00
Dmitriy Zaporozhets 60a98584f6 Merge pull request #7658 from Razer6/refresh_labels_page_on_delete 
Show labels help message if last label is deleted
 2014-09-05 14:39:40 +03:00
Robert Schilling bd2355191f Show labels help message if last label is deleted 2014-09-04 23:15:28 +02:00
Dmitriy Zaporozhets 9bb1d8fc8d Merge pull request #7382 from Razer6/git_ref_validation 
Validate branch/tag-names and references WebUI, API
 2014-09-04 15:52:42 +03:00
Dmitriy Zaporozhets 18e4e99764 Merge branch 'sha-link' of https://github.com/cirosantilli/gitlabhq into cirosantilli-sha-link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-09-04 15:47:54 +03:00
Dmitriy Zaporozhets 36c3e2cc62 Explicitly require active teab for tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-04 10:00:04 +03:00
Dmitriy Zaporozhets 5f6eb09cdf Improve issue filtering. Make tests pass 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 19:18:23 +03:00
Robert Schilling 392113919a Validate tag-names and references in WebUI, API 2014-09-03 13:08:36 +02:00
Robert Schilling 551145bc98 Validate branch-names and references in WebUI, API 
Add specs for GitRefValidator
 2014-09-03 13:08:35 +02:00
Dmitriy Zaporozhets a563065f3e Merge pull request #7523 from Razer6/fix_branch_delete 
Fix branch remove for branches containing a '/'
 2014-09-03 14:01:57 +03:00
Dmitriy Zaporozhets a2b6c1e65f Rename activity to project tab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-02 11:47:25 +03:00
Dmitriy Zaporozhets 6dd140047f Merge branch 'search-issues-spinach' into 'master' 
Added Spinach tests for search issues by issue-description

Added Spinach tests for 'search issues by description' feature which was added to Changelog 7.1 for feature "Filter by description on Issues#index page"

See merge request !172
 2014-09-01 11:35:09 +00:00