OSDN Git Service
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: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>
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>
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>
Dmitriy Zaporozhets [Fri, 20 Dec 2013 21:49:10 +0000 (13:49 -0800)]
Merge pull request #5888 from jameswritescode/passenger_fix
Don't use unicorn worker killer if using Phusion Passenger
skv [Fri, 20 Dec 2013 17:31:45 +0000 (21:31 +0400)]
coffee interpolation for template of user select
James Newton [Fri, 20 Dec 2013 16:30:34 +0000 (10:30 -0600)]
don't use unicorn worker killer if PhusionPassenger is defined
Dmitriy Zaporozhets [Fri, 20 Dec 2013 14:03:05 +0000 (16:03 +0200)]
Version 6.4.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 20 Dec 2013 14:02:26 +0000 (16:02 +0200)]
Update guide for 6.3 to 6.4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 20 Dec 2013 14:02:06 +0000 (16:02 +0200)]
Point ot 6-4-stable
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 20 Dec 2013 10:31:27 +0000 (10:31 +0000)]
Merge branch 'bug/mr_iids_duplicate' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 20 Dec 2013 08:03:29 +0000 (10:03 +0200)]
Use relative dates with tooltips fopr Issue#show and MR#show
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 20 Dec 2013 07:48:43 +0000 (09:48 +0200)]
Dont allow change of MR target or source projects after it was created
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 20 Dec 2013 06:56:39 +0000 (08:56 +0200)]
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Matthias Link [Thu, 19 Dec 2013 19:42:11 +0000 (20:42 +0100)]
Admin/Background Jobs: fixed spelling mistake
Dmitriy Zaporozhets [Thu, 19 Dec 2013 19:06:59 +0000 (21:06 +0200)]
Fix broadcast message factory
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 19 Dec 2013 19:00:44 +0000 (21:00 +0200)]
Consistent place for state-label across issues, mr, milestones
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 19 Dec 2013 18:25:01 +0000 (20:25 +0200)]
UI: use different padding in labels for Issues#show and Issues#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 19 Dec 2013 18:21:22 +0000 (20:21 +0200)]
UI: allign milestone to right for issue, mr show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 19 Dec 2013 18:11:01 +0000 (20:11 +0200)]
Add validations to BroadcastMessage color and font
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 19 Dec 2013 17:59:19 +0000 (19:59 +0200)]
Move broadcast colors CHANGELOG to 6.5
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 19 Dec 2013 17:58:40 +0000 (19:58 +0200)]
Merge branch 'atomaka/feature/message-colors' of https://github.com/atomaka/gitlabhq into 6-5-dev
Dmitriy Zaporozhets [Thu, 19 Dec 2013 17:54:57 +0000 (19:54 +0200)]
Added milestone_options and assigne_options helpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 19 Dec 2013 17:39:58 +0000 (19:39 +0200)]
remove unecessary bold text on Issue#show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 19 Dec 2013 17:36:27 +0000 (19:36 +0200)]
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>
Dmitriy Zaporozhets [Thu, 19 Dec 2013 17:15:19 +0000 (19:15 +0200)]
Merge branch 'feature-issue-actions' of https://github.com/jasonblanchard/gitlabhq into 6-5-dev
Dmitriy Zaporozhets [Thu, 19 Dec 2013 16:56:51 +0000 (08:56 -0800)]
Merge pull request #5865 from skv-headless/master
pluck user_ids during team import
Dmitriy Zaporozhets [Thu, 19 Dec 2013 16:56:09 +0000 (08:56 -0800)]
Merge pull request #5881 from gendoc/master
More issues and merge request events support in Project web hooks
Dmitriy Zaporozhets [Thu, 19 Dec 2013 16:54:07 +0000 (18:54 +0200)]
More visible title for Issues, MR etc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Humberto Pereira [Thu, 19 Dec 2013 15:32:30 +0000 (13:32 -0200)]
Updated help page for Project web hooks
Humberto Pereira [Thu, 19 Dec 2013 15:25:50 +0000 (13:25 -0200)]
Added hook execution to reopened e updated merge requests
Humberto Pereira [Thu, 19 Dec 2013 15:23:22 +0000 (13:23 -0200)]
Added hook execution to reopened e updated issues
Dmitriy Zaporozhets [Thu, 19 Dec 2013 15:15:48 +0000 (17:15 +0200)]
Show repo size for project show page in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 19 Dec 2013 07:30:42 +0000 (07:30 +0000)]
Merge branch 'unicorn_worker_killer' of /home/git/repositories/gitlab/gitlabhq
Andrew Tomaka [Mon, 9 Dec 2013 05:34:51 +0000 (00:34 -0500)]
Customization and previewing of broadcast messages
Dmitriy Zaporozhets [Wed, 18 Dec 2013 19:14:07 +0000 (11:14 -0800)]
Merge pull request #5867 from jhollingsworth/feature/styling-changes
Change archive icon and clone panel styling.
Dmitriy Zaporozhets [Wed, 18 Dec 2013 18:58:16 +0000 (20:58 +0200)]
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>
Jacob Vosmaer [Wed, 18 Dec 2013 16:06:49 +0000 (17:06 +0100)]
Use a block for the unicorn gems
Jacob Vosmaer [Wed, 18 Dec 2013 12:49:09 +0000 (13:49 +0100)]
Add unicorn-worker-killer with memory check
Conflicts:
Gemfile.lock
Dmitriy Zaporozhets [Wed, 18 Dec 2013 15:10:12 +0000 (17:10 +0200)]
6.4 in beta now
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 18 Dec 2013 15:03:18 +0000 (15:03 +0000)]
Merge branch 'irc-official' of /home/git/repositories/gitlab/gitlabhq
Jason Hollingsworth [Tue, 17 Dec 2013 19:35:51 +0000 (13:35 -0600)]
Change archive icon and clone panel styling.
Dmitriy Zaporozhets [Wed, 18 Dec 2013 14:33:40 +0000 (16:33 +0200)]
Set font-weight:500 for row titles
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 18 Dec 2013 14:27:52 +0000 (16:27 +0200)]
Rename Services to Project services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 18 Dec 2013 14:22:59 +0000 (14:22 +0000)]
Merge branch 'bug/archive_label_overflow' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 18 Dec 2013 14:07:49 +0000 (16:07 +0200)]
Make comment preview button white
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 18 Dec 2013 14:03:59 +0000 (16:03 +0200)]
Improve commits page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 18 Dec 2013 13:02:31 +0000 (15:02 +0200)]
move arhoved label from project title to sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 18 Dec 2013 12:41:06 +0000 (04:41 -0800)]
Merge pull request #5866 from jhollingsworth/fix/default-public-pull-url
Update default public pull url.
OSDN Git Service
