OSDN Git Service
Dmitriy Zaporozhets [Mon, 30 Dec 2013 21:55:15 +0000 (23:55 +0200)]
Convert span into col-md
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 30 Dec 2013 21:53:16 +0000 (23:53 +0200)]
Make app start with bootstrap 3 gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 30 Dec 2013 21:53:01 +0000 (23:53 +0200)]
Bootstrap-sass 3 gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 30 Dec 2013 17:14:41 +0000 (17:14 +0000)]
Merge branch 'timeago_js' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 30 Dec 2013 12:49:22 +0000 (14:49 +0200)]
Remove unnecessary ago keyword
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 30 Dec 2013 12:38:42 +0000 (14:38 +0200)]
Use jquery timeago plugin
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 30 Dec 2013 10:19:33 +0000 (10:19 +0000)]
Merge branch 'useful_http_headers' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Mon, 30 Dec 2013 08:41:05 +0000 (09:41 +0100)]
HTTP headers protect against MIME-sniffing, force https if enabled.
Dmitriy Zaporozhets [Mon, 30 Dec 2013 07:59:42 +0000 (09:59 +0200)]
Fix overflow on project panel if https enabled and resolution < 1100px
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 29 Dec 2013 16:58:47 +0000 (18:58 +0200)]
Fix project labels overflow for deploy keys page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 29 Dec 2013 16:36:41 +0000 (18:36 +0200)]
Restyle README section
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 29 Dec 2013 16:18:36 +0000 (18:18 +0200)]
Improve typography
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 29 Dec 2013 16:13:16 +0000 (18:13 +0200)]
Remove borders for wiki content. Fix wiki history UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 29 Dec 2013 14:47:31 +0000 (16:47 +0200)]
Mozilla osx font smoothing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 29 Dec 2013 13:55:09 +0000 (15:55 +0200)]
Hide last activity from group projects list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 29 Dec 2013 13:16:21 +0000 (13:16 +0000)]
Merge branch 'bug/500_on_rdoc_readme' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 29 Dec 2013 13:08:37 +0000 (13:08 +0000)]
Merge branch 'ui/compact_projects_list' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 29 Dec 2013 12:25:34 +0000 (12:25 +0000)]
Merge branch 'feature/dash_projects_sort' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 29 Dec 2013 12:17:13 +0000 (14:17 +0200)]
Fix 500 for rdoc files
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 29 Dec 2013 11:56:16 +0000 (13:56 +0200)]
Compact projects list on dashboard
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 29 Dec 2013 11:55:45 +0000 (13:55 +0200)]
Move project_last_activity to ProjectsHelper
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 29 Dec 2013 10:58:00 +0000 (12:58 +0200)]
Sort dropdown for Dashboard#projects page
Be default it sorts by name now
Respect filters like scope, label, visibility when do sort or another
filter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 29 Dec 2013 10:28:56 +0000 (12:28 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sun, 29 Dec 2013 10:27:33 +0000 (12:27 +0200)]
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>
Dmitriy Zaporozhets [Sun, 29 Dec 2013 09:55:27 +0000 (01:55 -0800)]
Merge pull request #5920 from tgerdes/raw_blob_api
Add api support for raw blob search
Dmitriy Zaporozhets [Sun, 29 Dec 2013 09:54:14 +0000 (01:54 -0800)]
Merge pull request #5938 from xieyubo/master
Force IE use latest engine to render.
Dmitriy Zaporozhets [Sat, 28 Dec 2013 10:54:37 +0000 (10:54 +0000)]
Merge branch 'release-candidate' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Fri, 27 Dec 2013 13:15:07 +0000 (13:15 +0000)]
Include release candidates in the monthly release process.
Dmitriy Zaporozhets [Fri, 27 Dec 2013 12:28:24 +0000 (14:28 +0200)]
add 6.4.3 to CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 27 Dec 2013 12:25:03 +0000 (14:25 +0200)]
Update votes ferom comments dynamically
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 27 Dec 2013 12:11:19 +0000 (14:11 +0200)]
Clear refresh interval for notes. Fixes duplicate note rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
xyb [Fri, 27 Dec 2013 11:38:29 +0000 (19:38 +0800)]
Force IE use latest engine to render.
Dmitriy Zaporozhets [Fri, 27 Dec 2013 10:13:30 +0000 (12:13 +0200)]
Reduce right margin or dashboard project visibility icon
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thom Gerdes [Mon, 23 Dec 2013 09:37:38 +0000 (01:37 -0800)]
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
Dmitriy Zaporozhets [Thu, 26 Dec 2013 13:11:48 +0000 (15:11 +0200)]
Add anchors to comments from event feed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 26 Dec 2013 12:58:15 +0000 (12:58 +0000)]
New stuff for 6.5 in CHANGELOG
Dmitriy Zaporozhets [Thu, 26 Dec 2013 11:31:14 +0000 (13:31 +0200)]
Merge branch 'skv-headless-privacy_label'
Dmitriy Zaporozhets [Thu, 26 Dec 2013 11:31:02 +0000 (13:31 +0200)]
Style project visibility icons on dashboard
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 26 Dec 2013 11:18:02 +0000 (13:18 +0200)]
Merge branch 'privacy_label' of https://github.com/skv-headless/gitlabhq into skv-headless-privacy_label
Dmitriy Zaporozhets [Thu, 26 Dec 2013 09:24:43 +0000 (11:24 +0200)]
Improve sorting for public projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 26 Dec 2013 09:16:30 +0000 (11:16 +0200)]
Add sorting to public projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 26 Dec 2013 08:52:50 +0000 (10:52 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 26 Dec 2013 08:51:52 +0000 (10:51 +0200)]
bump gitlab_git
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 26 Dec 2013 08:40:30 +0000 (00:40 -0800)]
Merge pull request #5928 from skv-headless/master
Fix warnings
Dmitriy Zaporozhets [Thu, 26 Dec 2013 08:23:08 +0000 (08:23 +0000)]
Merge branch 'refactor/notes' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 26 Dec 2013 08:20:36 +0000 (10:20 +0200)]
Add User#email uniq validation. Fixed confirmation for admin/users form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 26 Dec 2013 08:09:15 +0000 (10:09 +0200)]
Fix User#by_username_or_id for postgres
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 26 Dec 2013 07:44:18 +0000 (09:44 +0200)]
Fix file upload for edit note. Better style for discussion form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 26 Dec 2013 07:39:55 +0000 (09:39 +0200)]
fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
skv [Thu, 26 Dec 2013 06:44:59 +0000 (10:44 +0400)]
visibility level info in project tabs
Dmitriy Zaporozhets [Wed, 25 Dec 2013 21:21:26 +0000 (23:21 +0200)]
Improve tests and make preview for notes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 25 Dec 2013 20:33:40 +0000 (22:33 +0200)]
Remove old methods and classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 25 Dec 2013 20:32:48 +0000 (22:32 +0200)]
Update commentable controllers with new note vars
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 25 Dec 2013 20:32:23 +0000 (22:32 +0200)]
Switch Notes controller to use json
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 25 Dec 2013 20:31:18 +0000 (22:31 +0200)]
Write new Notes coffee class to handle comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
skv [Wed, 25 Dec 2013 14:12:25 +0000 (18:12 +0400)]
fix warnings
Dmitriy Zaporozhets [Wed, 25 Dec 2013 12:49:27 +0000 (12:49 +0000)]
Merge branch 'session_store' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 25 Dec 2013 11:32:43 +0000 (13:32 +0200)]
Make note anchors actually work
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Marin Jankovski [Wed, 25 Dec 2013 11:30:33 +0000 (12:30 +0100)]
Enable secure option if https is used.
Dmitriy Zaporozhets [Wed, 25 Dec 2013 10:45:54 +0000 (12:45 +0200)]
Improve FilterContext tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 25 Dec 2013 07:56:39 +0000 (09:56 +0200)]
Improve dev fixtures
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 25 Dec 2013 07:45:53 +0000 (09:45 +0200)]
Refactor FilterContext
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 25 Dec 2013 07:19:51 +0000 (09:19 +0200)]
Fix per-project counters for Dashboard filters
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 25 Dec 2013 07:08:56 +0000 (09:08 +0200)]
Include scope in dashboard filters
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 24 Dec 2013 18:59:00 +0000 (18:59 +0000)]
Merge branch 'feature/all_merge_requets' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 24 Dec 2013 17:04:57 +0000 (19:04 +0200)]
Tests for Dashboard#issues filter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 24 Dec 2013 16:22:48 +0000 (18:22 +0200)]
Add tests to Dashboard#merge_requests filter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 24 Dec 2013 15:21:25 +0000 (15:21 +0000)]
Merge branch 'refactor/scss' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 24 Dec 2013 12:53:52 +0000 (14:53 +0200)]
Show Assigned/Authored/All filter for dashboard issues and mr pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 24 Dec 2013 10:58:23 +0000 (12:58 +0200)]
use .body instaed of .ui-box-body
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 24 Dec 2013 10:53:56 +0000 (10:53 +0000)]
Merge branch 'improve/avatar_upload_only_images' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 24 Dec 2013 10:53:18 +0000 (10:53 +0000)]
Merge branch 'confirmation_protection' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 24 Dec 2013 09:45:42 +0000 (11:45 +0200)]
Use new ui-box classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 24 Dec 2013 09:45:28 +0000 (11:45 +0200)]
Refactor UI boxes. Split issue box to different class
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Marin Jankovski [Tue, 24 Dec 2013 09:11:33 +0000 (10:11 +0100)]
Confirmation url throttle.
Dmitriy Zaporozhets [Tue, 24 Dec 2013 08:55:45 +0000 (10:55 +0200)]
Add User#avatar_type tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 24 Dec 2013 07:49:29 +0000 (23:49 -0800)]
Merge pull request #5922 from jhollingsworth/fix/rake-routes
Fixed issue with `bundle exec rake routes` not running.
Jason Hollingsworth [Tue, 24 Dec 2013 02:01:38 +0000 (20:01 -0600)]
Fixed issue with `bundle exec rake routes` not running.
Wrap regex comments in (?#comment) construct.
Dmitriy Zaporozhets [Mon, 23 Dec 2013 18:28:59 +0000 (20:28 +0200)]
Dont allow upload of non-image formats for user avatar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 23 Dec 2013 18:02:38 +0000 (20:02 +0200)]
Mention that Upgrader works for 6.4.2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 23 Dec 2013 16:32:23 +0000 (18:32 +0200)]
No tabs, only 2 spaces
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 23 Dec 2013 16:29:10 +0000 (18:29 +0200)]
Add 6.4.1 and 6.4.2 CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 23 Dec 2013 16:01:51 +0000 (18:01 +0200)]
Fix upgrader
It created branch based on current branch which is an old version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 23 Dec 2013 14:41:24 +0000 (16:41 +0200)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 23 Dec 2013 14:41:06 +0000 (16:41 +0200)]
GitLab Upgrader requires v6.4.0+
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 23 Dec 2013 12:26:36 +0000 (14:26 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 23 Dec 2013 12:23:46 +0000 (04:23 -0800)]
Merge pull request #5851 from mynetx/sidebar-links-display-block
Make sidebar links more accessible, display: block
Dmitriy Zaporozhets [Mon, 23 Dec 2013 12:17:57 +0000 (12:17 +0000)]
Merge branch 'bug/broken_project_transfer' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 23 Dec 2013 12:17:44 +0000 (12:17 +0000)]
Merge branch 'bug/broken_path_change' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 23 Dec 2013 12:15:22 +0000 (14:15 +0200)]
Add docs for upgrader script
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 23 Dec 2013 11:24:10 +0000 (13:24 +0200)]
Fix project transfer feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 23 Dec 2013 11:19:13 +0000 (13:19 +0200)]
Fix 500 error when rename repository
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 22 Dec 2013 16:48:57 +0000 (08:48 -0800)]
Merge pull request #5900 from dprolife/patch-1
Fix 'uninitialized constant Unicorn' error
dprolife [Sun, 22 Dec 2013 10:08:43 +0000 (11:08 +0100)]
Fix 'uninitialized constant Unicorn' error
Dmitriy Zaporozhets [Sun, 22 Dec 2013 08:53:20 +0000 (00:53 -0800)]
Merge pull request #5883 from matthee/master
Admin/Background Jobs: fixed spelling mistake
Dmitriy Zaporozhets [Sun, 22 Dec 2013 08:53:04 +0000 (00:53 -0800)]
Merge pull request #5889 from skv-headless/master
coffee interpolation for template of user select
Dmitriy Zaporozhets [Sun, 22 Dec 2013 08:51:18 +0000 (00:51 -0800)]
Merge pull request #5894 from patschi/patch-1
Add command for updating the init.d script
Patschi [Sat, 21 Dec 2013 22:05:44 +0000 (23:05 +0100)]
Add command for updating the init.d script
Dmitriy Zaporozhets [Sat, 21 Dec 2013 21:23:59 +0000 (23:23 +0200)]
Merge branch '6-5-dev'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
VERSION
Dmitriy Zaporozhets [Sat, 21 Dec 2013 21:23:13 +0000 (23:23 +0200)]
Version to 6.5.0.pre
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>