Dmitriy Zaporozhets
231b91d0c8
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-12-29 12:28:56 +02:00
Dmitriy Zaporozhets
0f72f00ce9
Improve project show page UI
...
* Fixes overflow with long description
* Fixes overflow for project with long name
* Fixes overflow for non-retina iPad
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-29 12:27:33 +02:00
Dmitriy Zaporozhets
a4000f5d45
Merge pull request #5920 from tgerdes/raw_blob_api
...
Add api support for raw blob search
2013-12-29 01:55:27 -08:00
Dmitriy Zaporozhets
bd49d8dfa7
Merge pull request #5938 from xieyubo/master
...
Force IE use latest engine to render.
2013-12-29 01:54:14 -08:00
Dmitriy Zaporozhets
640175f5a5
Merge branch 'release-candidate' of /home/git/repositories/gitlab/gitlabhq
2013-12-28 10:54:37 +00:00
Sytse Sijbrandij
3333d8b87b
Include release candidates in the monthly release process.
2013-12-27 13:15:07 +00:00
Dmitriy Zaporozhets
3998bb3aba
add 6.4.3 to CHANGELOG
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-27 14:28:24 +02:00
Dmitriy Zaporozhets
00056c82f2
Update votes ferom comments dynamically
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-27 14:25:03 +02:00
Dmitriy Zaporozhets
32c7310f4a
Clear refresh interval for notes. Fixes duplicate note rendering
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-27 14:11:19 +02:00
xyb
498ec08da3
Force IE use latest engine to render.
2013-12-27 19:38:29 +08:00
Dmitriy Zaporozhets
5b1984ce5a
Reduce right margin or dashboard project visibility icon
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-27 12:13:30 +02:00
Thom Gerdes
27912f9c21
Add api support for raw blob search
...
See issue
http://feedback.gitlab.com/forums/176466-general/suggestions/4566001-expose-raw-object-search-via-the-gitlab-api
2013-12-26 08:54:13 -05:00
Dmitriy Zaporozhets
b27bd2b10d
Add anchors to comments from event feed
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-26 15:11:48 +02:00
Dmitriy Zaporozhets
9a247213a8
New stuff for 6.5 in CHANGELOG
2013-12-26 12:58:15 +00:00
Dmitriy Zaporozhets
fcf55171c4
Merge branch 'skv-headless-privacy_label'
2013-12-26 13:31:14 +02:00
Dmitriy Zaporozhets
05de390fd8
Style project visibility icons on dashboard
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-26 13:31:02 +02:00
Dmitriy Zaporozhets
fd6fc422c6
Merge branch 'privacy_label' of https://github.com/skv-headless/gitlabhq into skv-headless-privacy_label
2013-12-26 13:18:02 +02:00
Dmitriy Zaporozhets
7458437ed9
Improve sorting for public projects page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-26 11:24:43 +02:00
Dmitriy Zaporozhets
6a0c0f3f3f
Add sorting to public projects page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-26 11:16:30 +02:00
Dmitriy Zaporozhets
8310b4589d
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-12-26 10:52:50 +02:00
Dmitriy Zaporozhets
3df417b857
bump gitlab_git
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-26 10:51:52 +02:00
Dmitriy Zaporozhets
19c2c90cca
Merge pull request #5928 from skv-headless/master
...
Fix warnings
2013-12-26 00:40:30 -08:00
Dmitriy Zaporozhets
7bf0add0d1
Merge branch 'refactor/notes' of /home/git/repositories/gitlab/gitlabhq
2013-12-26 08:23:08 +00:00
Dmitriy Zaporozhets
4cd7a56333
Add User#email uniq validation. Fixed confirmation for admin/users form
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-26 10:20:36 +02:00
Dmitriy Zaporozhets
a389d77769
Fix User#by_username_or_id for postgres
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-26 10:09:15 +02:00
Dmitriy Zaporozhets
5f7db3e94b
Fix file upload for edit note. Better style for discussion form
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-26 09:44:18 +02:00
Dmitriy Zaporozhets
d4ec23b8b5
fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-26 09:39:55 +02:00
skv
aff37adb9e
visibility level info in project tabs
2013-12-26 10:44:59 +04: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
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
c797493e00
Merge branch 'session_store' of /home/git/repositories/gitlab/gitlabhq
2013-12-25 12:49:27 +00: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
Marin Jankovski
c447a2131d
Enable secure option if https is used.
2013-12-25 12:30:33 +01:00
Dmitriy Zaporozhets
73af33e4b1
Improve FilterContext tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-25 12:45:54 +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
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
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
ce527b68f0
Merge branch 'improve/avatar_upload_only_images' of /home/git/repositories/gitlab/gitlabhq
2013-12-24 10:53:56 +00:00
Dmitriy Zaporozhets
ede3446c6f
Merge branch 'confirmation_protection' of /home/git/repositories/gitlab/gitlabhq
2013-12-24 10:53:18 +00:00