deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4484 commits 6 branches 43 tags 25 MiB
Commit graph

131 commits

Author SHA1 Message Date
Riyad Preukschas
3022786948 Merge commit 'master' into discussions 
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
 2013-01-15 00:52:25 +01:00
Alex Denisov
97d17cf835 Event filters stores at cookies. 2013-01-09 19:30:20 +00:00
Alex Denisov
b255c3c44b Tests on events filtering added 2013-01-09 19:30:20 +00:00
Alex Denisov
2b93201533 Tests on EventFilters added 2013-01-09 19:30:19 +00:00
Dmitriy Zaporozhets
16b61590ab Spinach: admin logs, admin users 2013-01-09 19:38:27 +02:00
Dmitriy Zaporozhets
9773ccc451 sidekiq with green tests 2013-01-09 09:14:05 +03:00
Dmitriy Zaporozhets
7bfd38eaa9 spinach test: project services 2013-01-09 09:14:05 +03:00
Dmitriy Zaporozhets
2f6603e581 A bit of spinach tests 2013-01-09 08:14:05 +03:00
Dmitriy Zaporozhets
fb470e8e2a Validate username uniq in scope of namespace 2013-01-07 17:36:24 +02:00
Dmitriy Zaporozhets
a0bd09ab83 Fixed tests 2013-01-07 14:44:57 +02:00
Dmitriy Zaporozhets
68eb394824 Green button when we create new item, blue when save or some primary action 2013-01-06 00:08:02 +02:00
Dmitriy Zaporozhets
baf591cc27 Fix network test and snippets expired 2013-01-05 23:49:01 +02:00
Dmitriy Zaporozhets
ef5b36eaaf Fixed protected branches and file edit 2013-01-04 21:45:30 +02:00
Dmitriy Zaporozhets
afbdbb0c95 Rspec fixes 2013-01-04 18:50:31 +02:00
Dmitriy Zaporozhets
dccd8b6eaa Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
Dmitriy Zaporozhets
ce484fa9da Fixed admin -> group -> show 2013-01-02 20:45:11 +02:00
Dmitriy Zaporozhets
6a9e7dc55b Fixed spinach 2013-01-02 19:56:22 +02:00
Andrey Kumanyaev
655b836b2a test reanimated 2012-12-26 20:31:47 +04:00
Andrey Kumanyaev
25c5763780 Add functional in user section 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
9c574464a6 Add functional in admin section 2012-12-26 19:52:15 +04:00
Riyad Preukschas
db2c15369c Merge branch 'master' into discussions 
Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb
 2012-12-23 01:03:57 +01:00
Dmitriy Zaporozhets
40c6d87175 Merge pull request #2315 from koenpunt/gh-issue-513 
Added compare switch
 2012-12-20 06:15:39 -08:00
Koen Punt
9916e8d6dc Updated test to match with switched commits 
Added compare switch
 2012-12-20 14:39:39 +01:00
Dmitriy Zaporozhets
2f7effe804 Refactor issues, Remove ajax 2012-12-19 06:14:05 +03:00
Riyad Preukschas
0b3df2f128 Add merge request note feature 2012-12-03 22:51:55 +01:00
Dmitriy Zaporozhets
46bf3a0949 Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax 2012-12-02 13:29:24 +02:00
Dmitriy Zaporozhets
cf8b3692cd Merge pull request #2105 from jouve/improve_admin_views 
Improve admin section
 2012-11-29 00:39:50 -08:00
Alex Denisov
15a72a3b87 Spinach test added 2012-11-28 19:59:19 +02:00
Cyril
e0a9ffcdaa Improve admin views for project and groups 
* layout: add 'Groups' item to main_menu
* admin/dashboard: add a ui-box for groups
* projects and groups: remove nav tabs
 2012-11-28 18:04:28 +01:00
Robert Speicher
4db362f519 Add a link to each project on the Issues dashboard 2012-11-28 11:00:02 -05:00
Dmitriy Zaporozhets
c4f3c54ecb Fix group spinach feature 2012-11-27 21:33:56 +02:00
Dmitriy Zaporozhets
0693215c30 Fixed spinach and tests. Build should pass now 2012-11-23 22:55:38 +02:00
Dmitriy Zaporozhets
9304d049de Fixed some tests and snippet colorize 2012-11-23 22:31:09 +03:00
Robert Speicher
30a66c065a Improve user feedback on the Profile > Design page 
- Header changes immediately without a page reload
- Lets the user know that we actually saved their setting when changed
 2012-11-21 15:01:40 -05:00
Dmitriy Zaporozhets
c7aeb5127e Fix pre-selected assignee spinach 2012-11-16 13:03:07 +02:00
Dmitriy Zaporozhets
ba25b2dc84 Use poltergeist instaead of capybara-webkit 2012-11-16 12:27:39 +02:00
Riyad Preukschas
578cf89812 Fix specs 2012-11-14 01:20:37 +01:00
Dmitriy Zaporozhets
b28ab8962b Merge pull request #1928 from kouno/cleanup-factories 
Remove backward compatibility of factories.
 2012-11-13 08:45:03 -08:00
Vincent Bonmalais
80fb38de7a Remove backward compatibility of factories. 2012-11-13 22:27:45 +11:00
randx
3e04673334 Added feature test for stats 2012-11-10 23:33:10 +02:00
Dmitriy Zaporozhets
22d0569dbb Dashboard steps: 1.9 syntax & use of create instead of Factory 2012-11-07 13:56:48 +02:00
Dmitriy Zaporozhets
8114d36caf Merge pull request #1720 from coagulant/wiki_search 
Wiki search
 2012-11-07 03:51:20 -08:00
Valeriy Sizov
4f04d7df66 Merge pull request #1915 from tsigo/issue/1912 
Fix rendered action for password change failure
 2012-11-05 01:29:03 -08:00
Robert Speicher
89d9319a79 Fix rendered action for password change failure 
Closes #1912
 2012-11-04 16:47:37 -05:00
randx
f082c8ae2a Decouple and refactor GraphCommit 2012-11-04 23:43:33 +02:00
Robert Speicher
b1be377fb0 Add Spinach feature for Commit breadcrumbs 2012-11-01 17:57:44 -04:00
Dmitriy Zaporozhets
2032f4cd96 Fix tests fail cause of issue with grit stub 2012-10-31 15:22:13 +02:00
Dmitriy Zaporozhets
6f4576b743 Spinach feature 2012-10-24 15:23:04 +03:00
randx
e51b2d58e7 Restyled last push widget. Increased line-height for td in tables 2012-10-22 23:37:50 +03:00
randx
42abdf69d5 More group tests with spinach 2012-10-22 21:42:06 +03:00
Ilya Baryshev
e6524a919e Wiki search 
Very basic, using LIKE, and no search snippets.
 2012-10-16 23:05:11 +04:00
Riyad Preukschas
866b9f6d91 Make history link for trees look like action links for blobs 2012-10-16 00:57:15 +02:00
randx
809aefb828 Minor improve to UI and code formatting of gitlab web editor 2012-10-15 19:51:11 +03:00
Valeriy Sizov
47d9732a07 WebEditor: minor spinach fixes 2012-10-12 20:28:06 +03:00
Valeriy Sizov
358d7eff7d WebEditor: spinach 2012-10-12 20:07:24 +03:00
Robert Speicher
bf1554f8c4 Add Feature for milestone issue filter 
Closes #1167
 2012-10-10 13:08:36 -04:00
randx
c626ec3746 Implement pending dashboard step 2012-10-03 23:46:55 +03:00
Valery Sizov
9e80d2d4f7 Merge branch 'feature/groups' of dev.gitlabhq.com:gitlabhq 2012-10-03 12:17:48 +00:00
Dmitriy Zaporozhets
8b76e30656 Spianch test for group dashboard 2012-10-03 13:42:17 +03:00
Valeriy Sizov
b5f9d29f55 Merge pull request #1617 from dosire/reject-ssh-keys-that-break-gitolite 
Reject ssh keys that break gitolite
 2012-10-03 03:18:08 -07:00
Nihad Abbasov
025d5e68c8 fix build 2012-10-02 15:27:21 +06:00
randx
db69836319 Move ProjectHooks from spec/requests to spinach 2012-09-27 23:52:08 +03:00
randx
9cabe04368 tests for: Profile -> History 2012-09-27 23:23:11 +03:00
Robert Speicher
82c3f62603 Speed up Compare feature step 2012-09-26 16:32:26 -04:00
Robert Speicher
b462a13387 Compare views and cleanup 
- Remove compare/_head and just use commits/_head since they're identical
- Add index view; extract the form into a partial
 2012-09-26 16:32:24 -04:00
Robert Speicher
4252ea90c0 Add feature steps for a generic, non-"Shop" project 
This group is better for features that only deal with one project.
 2012-09-26 16:32:24 -04:00
Robert Speicher
51c1e49900 Change active tab and nav class to "active" 
The main nav used active, the sub nav used current. This normalizes it.
 2012-09-26 16:32:24 -04:00
Robert Speicher
cada511f8b Add features for checking the "Active Tab" across various pages 2012-09-26 16:32:24 -04:00
Robert Speicher
f814da38bf Limit commit history to 5 in Spinach 
Speeds things up a bit
 2012-09-26 16:32:23 -04:00
Robert Speicher
1048917232 Update usages of project_commit[s] route helpers 2012-09-26 16:32:23 -04:00
Robert Speicher
79a02df92e Update usages of tree_file_project_ref_path to project_tree_path 2012-09-26 16:32:21 -04:00
Marin Jankovski
81ffb0afdd Add valid looking key to test. 
Conflicts:

	features/steps/profile/profile_ssh_keys.rb
 2012-09-25 14:11:31 +02:00
Robert Speicher
ad3eefdcb8 Minor grammar change 
[ci skip]
 2012-09-22 17:06:30 -04:00
Robert Speicher
95bd93fe1a Remove Projects#team action 
Uses TeamMembers#index instead, to be more RESTful
 2012-09-16 10:07:06 -04:00
Dmitriy Zaporozhets
dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
Nihad Abbasov
79eb5ab396 refactor feature steps 2012-09-10 08:35:03 -07:00
Nihad Abbasov
b58155113b add spinach steps for remaining features 2012-09-10 06:35:23 -07:00
Nihad Abbasov
698500dd78 add spinach steps for project issues and source features 2012-09-10 05:34:01 -07:00
Nihad Abbasov
080bd12e16 rewrite project commits features using spinach 2012-09-10 04:27:11 -07:00
Nihad Abbasov
7aeb92b8e4 rewrite profile feature steps using spinach 2012-09-10 02:40:51 -07:00
Nihad Abbasov
d74f54736b rewrite dashboard feature steps using spinach 2012-09-10 02:20:12 -07:00