Dmitriy Zaporozhets
fed9a3d5c8
Merge branch 'koenpunt-raphael-update'
2013-01-05 23:18:05 +02:00
Dmitriy Zaporozhets
47dd9e42f7
Merge branch 'raphael-update' of https://github.com/koenpunt/gitlabhq into koenpunt-raphael-update
...
Conflicts:
Gemfile.lock
2013-01-05 23:17:50 +02:00
Dmitriy Zaporozhets
e142ebde5c
Merge branch 'koenpunt-mergerequest-to-coffee'
2013-01-05 23:09:38 +02:00
Dmitriy Zaporozhets
eded4bfa95
Raise exception and show message to user if repo missing satellite
2013-01-05 23:09:26 +02:00
Dmitriy Zaporozhets
eaa8cd28d0
Merge branch 'mergerequest-to-coffee' of https://github.com/koenpunt/gitlabhq into koenpunt-mergerequest-to-coffee
2013-01-05 22:54:48 +02:00
Dmitriy Zaporozhets
d5642d3098
Fix project fixtures
2013-01-05 22:50:12 +02:00
Dmitriy Zaporozhets
f33ada855c
Merge pull request #2226 from jouve/username
...
add username to team_member page
2013-01-05 12:33:39 -08:00
Dmitriy Zaporozhets
9f1a4acf62
Merge pull request #2207 from koenpunt/system-to-fileutils
...
replaced system() calls with FileUtils.* methods
2013-01-05 10:03:13 -08:00
Dmitriy Zaporozhets
546dd4c2b6
Merge pull request #2487 from koenpunt/patch-2
...
Fixed typo of recipes (recipres) in development fixtures
2013-01-05 10:01:10 -08:00
Dmitriy Zaporozhets
1724f45f46
Remove unused styles. Restyled Issues a bit
2013-01-05 14:49:08 +02:00
Dmitriy Zaporozhets
de05a598b3
Update to rails 3.2.10. Use simplercov in spinach too
2013-01-05 13:30:42 +02:00
Dmitriy Zaporozhets
2f5a733346
Add ci.gitlab.org badge
2013-01-05 13:12:31 +02:00
Dmitriy Zaporozhets
5a214ee6f1
Remove unused methods
2013-01-05 13:11:15 +02:00
Dmitriy Zaporozhets
e3d7ce2cc4
Tests are fixed now
2013-01-05 12:12:02 +02:00
Koen Punt
a1566a9c86
Converted merge_requests.js to coffeescript and updated code
2013-01-05 02:53:34 +01:00
Dmitriy Zaporozhets
0a94640e32
Merge branch 'refactoring/backend'
2013-01-05 00:49:58 +02:00
Dmitriy Zaporozhets
de6fa5dd52
Fix security spec
2013-01-05 00:49:43 +02:00
Dmitriy Zaporozhets
9a88e4d184
Fix some tests. Use travis-ci 1.9.2
2013-01-05 00:43:32 +02:00
Dmitriy Zaporozhets
e16cebac3e
Fixed styles, ProjectHook specs etc
2013-01-05 00:35:38 +02:00
Dmitriy Zaporozhets
c6298678f5
use ui-box as for all
2013-01-04 23:35:31 +02:00
Dmitriy Zaporozhets
14d0ef8f37
Show images preview in notes. Show line additions/deletions for commit
2013-01-04 22:13:32 +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
Koen Punt
eab1e6cea1
Fixed typo of recipes (recipres)
2013-01-04 17:43:41 +01:00
Koen Punt
47bb945caf
raphael from gitlabhq
2013-01-04 13:59:08 +01:00
Koen Punt
1b96ca348f
updated g.raphael
2013-01-04 13:59:08 +01:00
Koen Punt
90cba379a4
Updated graph tooltips and labels
2013-01-04 13:59:08 +01:00
Koen Punt
f04597d918
updated raphael
...
better labels
2013-01-04 13:59:08 +01:00
Dmitriy Zaporozhets
dccd8b6eaa
Continue refactoring. Use repostory and team
2013-01-04 08:43:25 +02:00
Dmitriy Zaporozhets
39ba934c0a
REpostiry, Team models
2013-01-03 21:09:18 +02:00
Dmitriy Zaporozhets
e6c0673ef1
Rspec models Milestone, Commit, UsersProject
2013-01-03 19:11:14 +02:00
Koen Punt
6b9177ca02
replaced system() calls with FileUtils.* method
...
This also makes that 'mv: cannot stat `/ho..' is not shown in the test :)
consistent spacing
require fileutils
Revert "require fileutils"
This reverts commit 54313d3bbaa60cfc5b405be50cc00b7f6b0cb715.
new hash notation
FileUtils.mv in begin/rescue block
2013-01-03 15:36:50 +01:00
Dmitriy Zaporozhets
2095780f24
fix tests
2013-01-03 12:37:12 +02:00
Dmitriy Zaporozhets
d6036f08aa
move activated? method to service
2013-01-03 09:52:14 +02:00
Dmitriy Zaporozhets
ce84e3f440
Fixed tests. added test for gitlab_ci_service model
2013-01-03 09:37:13 +02:00
Dmitriy Zaporozhets
e65731bb7e
Add concerns to autoload
2013-01-03 09:12:24 +02:00
Dmitriy Zaporozhets
a1999955eb
Merge pull request #2461 from gitlabhq/remove_roles
...
Remove models/roles and return to fat models
2013-01-02 23:07:32 -08:00
Dmitriy Zaporozhets
da03a5c7e2
more refactoring using models/concerns
2013-01-03 09:06:07 +02:00
Dmitriy Zaporozhets
40a956eb68
Few more fixes after removing roles
2013-01-03 00:01:08 +02:00
Dmitriy Zaporozhets
cac7723451
Get rid of roles
2013-01-02 23:35:11 +02:00
Dmitriy Zaporozhets
1b25a8f437
Improve Extract path
2013-01-02 22:39:02 +02:00
Dmitriy Zaporozhets
07a5cb2ef8
More readable Title for tab
2013-01-02 21:52:03 +02:00
Dmitriy Zaporozhets
642e64034c
Fix crash on group => show
2013-01-02 20:59:47 +02:00
Dmitriy Zaporozhets
ce484fa9da
Fixed admin -> group -> show
2013-01-02 20:45:11 +02:00
Dmitriy Zaporozhets
67896ea9a2
Fixed missing current user for issue observer
2013-01-02 20:25:25 +02:00
Dmitriy Zaporozhets
6a9e7dc55b
Fixed spinach
2013-01-02 19:56:22 +02:00
Dmitriy Zaporozhets
ccf0686b01
Fix api specs. Use id instead path
2013-01-02 19:46:06 +02:00
Dmitriy Zaporozhets
d431e43392
Fix few bugs and tests after refactoring ownership logic
2013-01-02 19:32:34 +02:00
Dmitriy Zaporozhets
00a1f5bc2c
Project has now correct owner and creator. Increased test coverage
2013-01-02 19:00:00 +02:00
Dmitriy Zaporozhets
91995909d9
Fix #2375 . Admin and owner can manage groups
2013-01-02 18:57:02 +02:00