OSDN Git Service
Kevin Lyda [Sun, 5 Jan 2014 13:53:08 +0000 (13:53 +0000)]
Merge branch 'master' into logo-white-compress
Conflicts:
app/assets/images/logo-black.png
app/assets/images/logo-white.png
Dmitriy Zaporozhets [Sun, 5 Jan 2014 11:59:01 +0000 (13:59 +0200)]
Better css for chosen selects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 5 Jan 2014 11:58:48 +0000 (13:58 +0200)]
Fix project network ui
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 5 Jan 2014 11:45:03 +0000 (13:45 +0200)]
Fix blob remove modal style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 5 Jan 2014 11:41:09 +0000 (13:41 +0200)]
Fix network tests. Removed console.log
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 5 Jan 2014 11:29:21 +0000 (13:29 +0200)]
Use latest gon gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 4 Jan 2014 20:45:48 +0000 (12:45 -0800)]
Merge pull request #5891 from jhollingsworth/feature/zip-archive
Add support for various archive formats.
Dmitriy Zaporozhets [Sat, 4 Jan 2014 17:46:52 +0000 (19:46 +0200)]
responsive chosen selects. Hide milestone dropdown for sm displays
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 4 Jan 2014 17:32:06 +0000 (19:32 +0200)]
twbs3 for system hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 4 Jan 2014 17:30:38 +0000 (19:30 +0200)]
twbs3 for broadcase messages page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 4 Jan 2014 17:27:09 +0000 (19:27 +0200)]
twbs3 style for admin, tree, network, commits
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 4 Jan 2014 17:26:12 +0000 (19:26 +0200)]
Improve group views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 4 Jan 2014 17:25:35 +0000 (19:25 +0200)]
Scale graphs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 3 Jan 2014 21:46:46 +0000 (23:46 +0200)]
Move nav-tabs to gl_bootstrap
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 3 Jan 2014 21:46:32 +0000 (23:46 +0200)]
Style admin->projects filter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 3 Jan 2014 21:28:00 +0000 (23:28 +0200)]
Move labels css to gl_bootstrap. Fixed label rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 3 Jan 2014 21:15:13 +0000 (23:15 +0200)]
Fix alerts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 3 Jan 2014 20:58:48 +0000 (22:58 +0200)]
Merge branch 'dogfood'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
doc/update/6.0-to-6.4.md
Dmitriy Zaporozhets [Fri, 3 Jan 2014 20:56:22 +0000 (20:56 +0000)]
Merge branch '6-4-fast-track' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 3 Jan 2014 20:54:53 +0000 (20:54 +0000)]
Merge branch 'exclude_subdomains_in_header' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Fri, 3 Jan 2014 15:02:57 +0000 (16:02 +0100)]
Do not include subtomains in STS header.
Jason Hollingsworth [Fri, 20 Dec 2013 19:12:44 +0000 (13:12 -0600)]
Add support for various archive formats.
Used mime-types gem instead of hardcoding content types.
Allow multiple extensions in archive route (.tar.gz, .tar.bz2).
Change content disposition from infile(?) to attachment for api.
Fixed api would return “archive” instead of {project}-{hash}.{ext}
Dmitriy Zaporozhets [Thu, 2 Jan 2014 12:33:15 +0000 (14:33 +0200)]
Style search page for twbs3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 2 Jan 2014 12:14:27 +0000 (12:14 +0000)]
Merge branch 'bootstrap3' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 2 Jan 2014 11:40:18 +0000 (13:40 +0200)]
Disable unused bootstrap components
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 2 Jan 2014 11:36:47 +0000 (13:36 +0200)]
Style new branch/tag forms
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 2 Jan 2014 11:32:27 +0000 (13:32 +0200)]
Style deploy keys form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 2 Jan 2014 11:26:58 +0000 (13:26 +0200)]
Fix snippet form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 2 Jan 2014 11:11:52 +0000 (13:11 +0200)]
Fix wiki tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
dosire [Thu, 2 Jan 2014 08:16:02 +0000 (09:16 +0100)]
Also update links to recipes.
Dmitriy Zaporozhets [Wed, 1 Jan 2014 21:13:54 +0000 (23:13 +0200)]
Smaller select for ref switcher
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 1 Jan 2014 20:59:06 +0000 (22:59 +0200)]
Fix votes block. twbs3 progress bars
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 1 Jan 2014 20:44:30 +0000 (22:44 +0200)]
Restyle wiki for for twbs3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 1 Jan 2014 20:27:10 +0000 (22:27 +0200)]
Style MR form page for twbs3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 1 Jan 2014 20:11:18 +0000 (22:11 +0200)]
Restyle issue form. Replace inputs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 1 Jan 2014 19:59:45 +0000 (21:59 +0200)]
Fix modal dialogs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 1 Jan 2014 19:48:41 +0000 (21:48 +0200)]
Disable twbs buttons and glyphicons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 1 Jan 2014 19:43:23 +0000 (21:43 +0200)]
Comment failing test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 1 Jan 2014 19:42:42 +0000 (21:42 +0200)]
Include tw bootstrap manually. Fix hide class
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 1 Jan 2014 18:53:44 +0000 (20:53 +0200)]
Style devise views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 15:08:31 +0000 (17:08 +0200)]
Fix compare view and services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 14:34:14 +0000 (16:34 +0200)]
alert-error to alert-danger
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 14:16:50 +0000 (16:16 +0200)]
Style project edit section
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 14:01:25 +0000 (16:01 +0200)]
New project page with bootstrap3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 13:46:46 +0000 (15:46 +0200)]
Responsive improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 13:34:06 +0000 (15:34 +0200)]
Add viewport meta
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 12:58:52 +0000 (14:58 +0200)]
refactor scss pt3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 12:42:32 +0000 (14:42 +0200)]
refactor scss pt2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 12:39:45 +0000 (14:39 +0200)]
Refactor gerneric css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 12:12:20 +0000 (14:12 +0200)]
Restyle visibility icon
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 10:40:18 +0000 (12:40 +0200)]
Hide navbar nav for tablets and phones, move visibility icon outside of layout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 10:01:48 +0000 (12:01 +0200)]
Dashboard css improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 01:15:58 +0000 (03:15 +0200)]
Fix some css after bootstrap 3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 31 Dec 2013 00:50:36 +0000 (02:50 +0200)]
Migrate forms and inputs pt1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 30 Dec 2013 23:27:02 +0000 (01:27 +0200)]
Update form classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 30 Dec 2013 23:12:02 +0000 (01:12 +0200)]
Fix header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 30 Dec 2013 22:38:53 +0000 (00:38 +0200)]
css class .hide has \!important so use gl-hide instead
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 30 Dec 2013 22:36:31 +0000 (00:36 +0200)]
Fix forms and header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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
dosire [Mon, 30 Dec 2013 13:27:18 +0000 (14:27 +0100)]
Change canonical urls to GitLab Cloud.
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
dosire [Mon, 30 Dec 2013 10:02:15 +0000 (11:02 +0100)]
Forgot to change the title.
dosire [Mon, 30 Dec 2013 10:00:45 +0000 (11:00 +0100)]
Fast update can also be done for 6.4.
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