OSDN Git Service
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
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.
Dmitriy Zaporozhets [Wed, 18 Dec 2013 12:40:37 +0000 (14:40 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Wed, 18 Dec 2013 12:40:09 +0000 (12:40 +0000)]
Merge branch 'feature/email_on_push_service' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 18 Dec 2013 12:23:13 +0000 (04:23 -0800)]
Merge pull request #5868 from beautyfree/patch-1
Duplicate opened scope for issue
Dmitriy Zaporozhets [Wed, 18 Dec 2013 12:22:46 +0000 (04:22 -0800)]
Merge pull request #5869 from Spone/patch-1
Tiny wording fix
Dmitriy Zaporozhets [Wed, 18 Dec 2013 11:42:12 +0000 (13:42 +0200)]
Move EmailOnPush logic to async worker
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 18 Dec 2013 11:30:04 +0000 (13:30 +0200)]
Email on push mailer spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Hans Lemuet [Tue, 17 Dec 2013 23:04:40 +0000 (00:04 +0100)]
tiny wording fix
GitLab users can can see this snippet -> GitLab users can see this snippet
Alexey Elizarov [Tue, 17 Dec 2013 20:32:19 +0000 (23:32 +0300)]
Duplicate opened scope for issue
Was it correct?
Jason Hollingsworth [Wed, 4 Dec 2013 02:13:19 +0000 (20:13 -0600)]
Update default public pull url.
This updates the default pull URL for public projects when the user
is not logged in.
skv [Tue, 17 Dec 2013 18:37:56 +0000 (22:37 +0400)]
pluck user_ids during team import
dosire [Tue, 17 Dec 2013 17:00:43 +0000 (18:00 +0100)]
Remove line break.
dosire [Tue, 17 Dec 2013 16:58:59 +0000 (17:58 +0100)]
Make irc channel official.
Dmitriy Zaporozhets [Tue, 17 Dec 2013 14:35:37 +0000 (14:35 +0000)]
Merge branch 'contributing-enhancements' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 17 Dec 2013 14:31:12 +0000 (16:31 +0200)]
Better description to EmailsOnPush service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 17 Dec 2013 14:29:08 +0000 (16:29 +0200)]
Add spinach tests for email on push service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 17 Dec 2013 14:20:45 +0000 (16:20 +0200)]
Email on push: dont send email if new branch was pushed or branch was removed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 17 Dec 2013 13:30:15 +0000 (15:30 +0200)]
Add templates for Emails on push
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 17 Dec 2013 12:50:19 +0000 (14:50 +0200)]
Fix db schema
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 17 Dec 2013 12:45:55 +0000 (14:45 +0200)]
Add new method to mailer for deliver emails with push info
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 17 Dec 2013 10:58:44 +0000 (12:58 +0200)]
Add project_services dir to autoload path
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 17 Dec 2013 10:42:40 +0000 (12:42 +0200)]
Create EmailsOnPushService model
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 17 Dec 2013 10:42:13 +0000 (12:42 +0200)]
Sort project services by title. Add textarea support to it
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 17 Dec 2013 10:20:36 +0000 (12:20 +0200)]
Move project services models to own subdirectory
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 17 Dec 2013 09:54:07 +0000 (11:54 +0200)]
Add 6.4 entries to CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 17 Dec 2013 09:38:30 +0000 (11:38 +0200)]
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
dosire [Tue, 17 Dec 2013 08:37:53 +0000 (09:37 +0100)]
More hints for pull requests.
Dmitriy Zaporozhets [Tue, 17 Dec 2013 06:54:49 +0000 (22:54 -0800)]
Merge pull request #5862 from jvanbaarsen/patch-1
Fixed the no_avatar.png path
Dmitriy Zaporozhets [Tue, 17 Dec 2013 06:05:52 +0000 (06:05 +0000)]
Merge branch 'improve/devise_ui' of /home/git/repositories/gitlab/gitlabhq
Jeroen van Baarsen [Mon, 16 Dec 2013 20:56:45 +0000 (21:56 +0100)]
Fixed the no_avatar.png path
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4394
Dmitriy Zaporozhets [Mon, 16 Dec 2013 19:30:52 +0000 (19:30 +0000)]
Merge branch 'feature/project_in_mr_emails' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 16 Dec 2013 19:30:24 +0000 (21:30 +0200)]
Merge branch 'improve/repo_head_update'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/models/project.rb
Dmitriy Zaporozhets [Mon, 16 Dec 2013 19:11:52 +0000 (21:11 +0200)]
Improve UI/UX for reset_password, signup, confirmation pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 16 Dec 2013 19:10:59 +0000 (21:10 +0200)]
Add resend-confirmation-link to sign-in page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 16 Dec 2013 19:10:18 +0000 (21:10 +0200)]
Improve email with confirmation instructions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 16 Dec 2013 19:09:15 +0000 (21:09 +0200)]
Style devise error messages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 16 Dec 2013 18:06:26 +0000 (10:06 -0800)]
Merge pull request #5841 from Popl7/archiving_old_projects
Archiving old projects for feature request
Dmitriy Zaporozhets [Mon, 16 Dec 2013 18:03:52 +0000 (10:03 -0800)]
Merge pull request #5843 from bke-drewb/fix/dashboard_event_updates
Fix dashboard event caching
Dmitriy Zaporozhets [Mon, 16 Dec 2013 17:56:47 +0000 (19:56 +0200)]
Add @project variable to merge request emails
After this change project name appears in the top part of email when you
open/close/accept merge request.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 16 Dec 2013 17:34:56 +0000 (19:34 +0200)]
Update repository head successively during project update
It prevents situation when async worker slowly updates HEAD and we show
old branch as repository HEAD in project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Steven Thonus [Fri, 29 Nov 2013 16:10:59 +0000 (17:10 +0100)]
Archiving old projects; archived projects aren't shown on dashboard
features for archive projects
abilities for archived project
other abilities for archive projects
only limit commits and merges for archived projects
ability changed to prohibited actions on archived projects
added spec and feature tests for archive projects
changed search bar not to include archived projects
Dmitriy Zaporozhets [Mon, 16 Dec 2013 12:52:42 +0000 (14:52 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 16 Dec 2013 12:52:04 +0000 (14:52 +0200)]
Fixed db schema
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jacob Vosmaer [Mon, 16 Dec 2013 12:47:14 +0000 (04:47 -0800)]
Merge pull request #5645 from sajanp/enhancement/install-guide
Reorder steps to install web server before running gitlab:check
Dmitriy Zaporozhets [Mon, 16 Dec 2013 11:54:04 +0000 (03:54 -0800)]
Merge pull request #5617 from zeeZ/nginx-proxy
Add X-Forwarded-For to nginx config
Dmitriy Zaporozhets [Mon, 16 Dec 2013 11:25:00 +0000 (03:25 -0800)]
Merge pull request #5849 from bke-drewb/feature/hide_no_ssh_key_message
Allow user to hide the message to add an ssh key permanently
Dmitriy Zaporozhets [Mon, 16 Dec 2013 11:22:55 +0000 (03:22 -0800)]
Merge pull request #5847 from skv-headless/fix_deprecation_warnings
fix most of warnings
Dmitriy Zaporozhets [Mon, 16 Dec 2013 10:54:15 +0000 (02:54 -0800)]
Merge pull request #5856 from nishigori/fix-typo
Fix messages typo
Dmitriy Zaporozhets [Mon, 16 Dec 2013 10:53:12 +0000 (02:53 -0800)]
Merge pull request #5848 from bke-drewb/feature/time_ago_tooltips
Add time ago tooltips to show actual date/time
Dmitriy Zaporozhets [Mon, 16 Dec 2013 10:51:23 +0000 (02:51 -0800)]
Merge pull request #5681 from chopmann/patch-2
FIX: Browser back button breaks "Loading..." visual
Takuya Nishigori [Mon, 16 Dec 2013 08:57:50 +0000 (17:57 +0900)]
Fix messages typo
Drew Blessing [Sun, 15 Dec 2013 01:28:17 +0000 (19:28 -0600)]
Allow user to hide the message to add an ssh key permanently
Favor links instead of buttons
Remove unnecessary class
Remove extra space
Drew Blessing [Fri, 13 Dec 2013 21:31:23 +0000 (15:31 -0600)]
Add time ago tooltips to show actual date/time
Clean up admin dashboad tooltips
Clean up admin dashboad tooltips
Clean up admin dashboad tooltips
Add helper method
change to use app helper
Modify tooltips to use new helper
Convert remaining times
Adjust one tooltip
skv [Sat, 14 Dec 2013 13:43:48 +0000 (17:43 +0400)]
fix most of warnings
Dmitriy Zaporozhets [Sat, 14 Dec 2013 12:11:31 +0000 (14:11 +0200)]
Remove colored gem from upgrader script. pt2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 14 Dec 2013 12:10:24 +0000 (14:10 +0200)]
Remove colored gem from upgrader script
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Drew Blessing [Fri, 13 Dec 2013 19:40:45 +0000 (13:40 -0600)]
Fix dashboard event caching
Dmitriy Zaporozhets [Fri, 13 Dec 2013 14:45:27 +0000 (14:45 +0000)]
Merge branch 'feature/minor_update_script' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 13 Dec 2013 14:23:38 +0000 (16:23 +0200)]
Use 'ruby script/upgrade.rb -y' instead of ENV
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 13 Dec 2013 14:17:54 +0000 (16:17 +0200)]
Allow non-interactive run of upgrade script. ruby script/upgrade.rb FORCE=yes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 13 Dec 2013 13:28:55 +0000 (13:28 +0000)]
Merge branch 'fix/system_hooks_ui' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 13 Dec 2013 13:22:27 +0000 (15:22 +0200)]
Create branch for tag
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 13 Dec 2013 13:18:57 +0000 (15:18 +0200)]
Minor version upgrader
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 13 Dec 2013 11:21:12 +0000 (13:21 +0200)]
Show MR accept info only if merge request is open
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 13 Dec 2013 11:14:43 +0000 (13:14 +0200)]
Fix header case
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 13 Dec 2013 11:12:54 +0000 (13:12 +0200)]
Fix broken UI for admin system hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 12 Dec 2013 17:05:21 +0000 (19:05 +0200)]
Add authenticity_token: true to multipart forms
Rails 4 does not generate token by default
It fixes bug when you get to sign-in page after trying to upload image
with comment
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 12 Dec 2013 16:31:01 +0000 (18:31 +0200)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 12 Dec 2013 16:30:32 +0000 (18:30 +0200)]
Add support for relative url to GitLab.GfmAutoComplete.Emoji.assetBase
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 12 Dec 2013 14:30:05 +0000 (14:30 +0000)]
Merge branch 'fog_expiration_date' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 12 Dec 2013 13:31:37 +0000 (15:31 +0200)]
Fix emojii autocomplete
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 12 Dec 2013 13:12:12 +0000 (15:12 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 12 Dec 2013 13:10:04 +0000 (13:10 +0000)]
Merge branch 'bug/mr_duplicate_iids' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 12 Dec 2013 12:20:08 +0000 (14:20 +0200)]
Fix test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 12 Dec 2013 10:28:44 +0000 (02:28 -0800)]
Merge pull request #5827 from Razer6/remove_rails4_travis
Remove rails4 branch in travis configuration
Dmitriy Zaporozhets [Thu, 12 Dec 2013 10:20:54 +0000 (12:20 +0200)]
Allow close of broken MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 12 Dec 2013 09:52:10 +0000 (11:52 +0200)]
Use MR#source_project_path method instead of merge_request.source_project.path_with_namespace
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 12 Dec 2013 09:51:39 +0000 (11:51 +0200)]
Proper erro message for MR when fork removed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Robert Schilling [Thu, 12 Dec 2013 09:46:49 +0000 (10:46 +0100)]
Remove rails4 branch in travis configuration since this branch is already merged
OSDN Git Service
