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
9305ef8940
Remove old methods and classes
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-25 22:33:40 +02:00
Dmitriy Zaporozhets
f554aa38d5
Update commentable controllers with new note vars
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-25 22:32:48 +02:00
Dmitriy Zaporozhets
48c682b52f
Switch Notes controller to use json
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-25 22:32:23 +02:00
Dmitriy Zaporozhets
923bd2ecd2
Write new Notes coffee class to handle comments
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-25 22:31:18 +02:00
skv
a443a19862
fix warnings
2013-12-25 23:29:40 +04:00
Dmitriy Zaporozhets
f7e7dc7ebb
Make note anchors actually work
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-25 13:32:43 +02:00
Dmitriy Zaporozhets
34f994b7c5
Improve dev fixtures
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-25 09:56:39 +02:00
Dmitriy Zaporozhets
1e64333c5f
Refactor FilterContext
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-25 09:45:53 +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
f6a4e5636d
Include scope in dashboard filters
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-25 09:08:56 +02:00
Dmitriy Zaporozhets
16ea2ec189
Merge branch 'feature/all_merge_requets' of /home/git/repositories/gitlab/gitlabhq
2013-12-24 18:59:00 +00: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
a16d755813
Merge branch 'refactor/scss' of /home/git/repositories/gitlab/gitlabhq
2013-12-24 15:21:25 +00:00
Dmitriy Zaporozhets
5953582b65
Show Assigned/Authored/All filter for dashboard issues and mr pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-24 14:53:52 +02:00
Dmitriy Zaporozhets
0c0beec26e
use .body instaed of .ui-box-body
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-24 12:58:23 +02:00
Dmitriy Zaporozhets
dac67ed65f
Use new ui-box classes
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-24 11:45:42 +02:00
Dmitriy Zaporozhets
4345e9220e
Refactor UI boxes. Split issue box to different class
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-24 11:45:28 +02:00
Dmitriy Zaporozhets
e6f83399f3
Dont allow upload of non-image formats for user avatar
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-23 20:28:59 +02:00
Dmitriy Zaporozhets
a6cbeaca83
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-12-23 14:26:36 +02:00
Dmitriy Zaporozhets
cdd7be01bd
Merge pull request #5851 from mynetx/sidebar-links-display-block
...
Make sidebar links more accessible, display: block
2013-12-23 04:23:46 -08:00
Dmitriy Zaporozhets
7765777583
Fix project transfer feature
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-23 13:24:10 +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
Dmitriy Zaporozhets
854977a201
Merge pull request #5883 from matthee/master
...
Admin/Background Jobs: fixed spelling mistake
2013-12-22 00:53:20 -08:00
Dmitriy Zaporozhets
2008361b8e
Merge pull request #5889 from skv-headless/master
...
coffee interpolation for template of user select
2013-12-22 00:53:04 -08:00
Dmitriy Zaporozhets
f23ffeece7
Merge branch '6-5-dev'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
VERSION
2013-12-21 23:23:59 +02:00
skv
ae3cb2d6ce
coffee interpolation for template of user select
2013-12-20 21:31:45 +04:00
Dmitriy Zaporozhets
a849676300
Use relative dates with tooltips fopr Issue#show and MR#show
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-20 10:03:29 +02:00
Dmitriy Zaporozhets
1231a3678a
Dont allow change of MR target or source projects after it was created
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-20 09:48:43 +02:00
Matthias Link
5c17be3604
Admin/Background Jobs: fixed spelling mistake
2013-12-19 20:42:11 +01:00
Dmitriy Zaporozhets
d1aff25ca4
Consistent place for state-label across issues, mr, milestones
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-19 21:00:44 +02:00
Dmitriy Zaporozhets
3cdb8f26c9
UI: use different padding in labels for Issues#show and Issues#index
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-19 20:25:01 +02:00
Dmitriy Zaporozhets
63d5fcc868
UI: allign milestone to right for issue, mr show page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-19 20:21:22 +02:00
Dmitriy Zaporozhets
d1e8495890
Add validations to BroadcastMessage color and font
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-19 20:11:01 +02:00
Dmitriy Zaporozhets
aef944ba7f
Merge branch 'atomaka/feature/message-colors' of https://github.com/atomaka/gitlabhq into 6-5-dev
2013-12-19 19:58:40 +02:00
Dmitriy Zaporozhets
3958330edc
Added milestone_options and assigne_options helpers
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-19 19:54:57 +02:00
Dmitriy Zaporozhets
5c68f4f4e5
remove unecessary bold text on Issue#show page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-19 19:39:58 +02:00
Dmitriy Zaporozhets
1616dfdc07
UI improvements to issue show page
...
* labels moved below the issue
* removed margin in "created by..." area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-19 19:36:27 +02:00
Dmitriy Zaporozhets
5405f19bac
Merge branch 'feature-issue-actions' of https://github.com/jasonblanchard/gitlabhq into 6-5-dev
2013-12-19 19:15:19 +02:00
Dmitriy Zaporozhets
8bcb2ff27e
Merge pull request #5865 from skv-headless/master
...
pluck user_ids during team import
2013-12-19 08:56:51 -08:00
Dmitriy Zaporozhets
33feaa0428
Merge pull request #5881 from gendoc/master
...
More issues and merge request events support in Project web hooks
2013-12-19 08:56:09 -08:00
Dmitriy Zaporozhets
dc4b7cb49a
More visible title for Issues, MR etc
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-19 18:54:07 +02:00
Humberto Pereira
392d79db0e
Updated help page for Project web hooks
2013-12-19 13:32:30 -02:00
Humberto Pereira
d429835ae0
Added hook execution to reopened e updated merge requests
2013-12-19 13:25:50 -02:00
Humberto Pereira
1e8add3229
Added hook execution to reopened e updated issues
2013-12-19 13:23:22 -02:00
Dmitriy Zaporozhets
8c670b66f0
Show repo size for project show page in admin area
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-19 17:15:48 +02:00
Jacob Carlborg
f811495429
Add button for removing source branch for merged MR's.
2013-12-19 14:02:54 +01:00
Andrew Tomaka
0760ba3efb
Customization and previewing of broadcast messages
2013-12-18 17:43:45 -05:00
Dmitriy Zaporozhets
566b49624a
Merge pull request #5867 from jhollingsworth/feature/styling-changes
...
Change archive icon and clone panel styling.
2013-12-18 11:14:07 -08:00
Dmitriy Zaporozhets
35c4351e2b
Validate project creator only on create
...
This fixes bug when creator was removed and you cant edit project
because validation requires creator.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-18 20:58:16 +02:00