OSDN Git Service
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>
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
Dmitriy Zaporozhets [Thu, 12 Dec 2013 09:34:42 +0000 (11:34 +0200)]
Add new methods to MR to check if source or target branch exists
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 12 Dec 2013 09:33:57 +0000 (11:33 +0200)]
Render valid message when MR source or target branch was removed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 12 Dec 2013 09:32:16 +0000 (11:32 +0200)]
do not remove merge requests when fork project destroyed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 11 Dec 2013 17:30:49 +0000 (17:30 +0000)]
Merge branch 'bug/at_disappear' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Wed, 11 Dec 2013 14:23:21 +0000 (15:23 +0100)]
Reduce Fog expiration period to 17 years
Jacob Vosmaer [Wed, 11 Dec 2013 13:54:26 +0000 (14:54 +0100)]
Expire fog links after 34 years
Dmitriy Zaporozhets [Wed, 11 Dec 2013 16:17:08 +0000 (18:17 +0200)]
Fix disappearing @ when mention user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 11 Dec 2013 16:02:14 +0000 (16:02 +0000)]
Merge branch 'improve/avatar_size' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 11 Dec 2013 15:59:37 +0000 (17:59 +0200)]
Add DELETE to api cors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 11 Dec 2013 15:43:21 +0000 (07:43 -0800)]
Merge pull request #5759 from bke-drewb/issue-5496
Add cache expiry on avatar creation/removal
Drew Blessing [Wed, 11 Dec 2013 15:30:22 +0000 (09:30 -0600)]
Expire event cache on avatar creation/removal
Dmitriy Zaporozhets [Wed, 11 Dec 2013 14:34:10 +0000 (14:34 +0000)]
Update deploy.sh script with assets commands
Dmitriy Zaporozhets [Wed, 11 Dec 2013 14:09:23 +0000 (16:09 +0200)]
Dashboard avatars: No need to load 40px images if we render them in 24px
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 11 Dec 2013 09:36:28 +0000 (09:36 +0000)]
Merge branch 'rails4' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 11 Dec 2013 07:29:12 +0000 (23:29 -0800)]
Merge pull request #5819 from jvanbaarsen/rails4
Fixed all the confirm: deprecation warnings
Dmitriy Zaporozhets [Wed, 11 Dec 2013 07:19:36 +0000 (09:19 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Wed, 11 Dec 2013 07:18:40 +0000 (07:18 +0000)]
Merge branch 'rails4' of /home/git/repositories/gitlab/gitlabhq
Jeroen van Baarsen [Tue, 10 Dec 2013 19:33:21 +0000 (20:33 +0100)]
Fixed all the confirm: deprecation warnings
Dmitriy Zaporozhets [Tue, 10 Dec 2013 15:07:46 +0000 (17:07 +0200)]
Virtus to version 1.0.1. Bye-bye backports
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 14:03:24 +0000 (16:03 +0200)]
Update jasmine gem to work with rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 13:43:27 +0000 (15:43 +0200)]
fix observer specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 12:15:08 +0000 (14:15 +0200)]
Add require for Files contexts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jacob Vosmaer [Tue, 10 Dec 2013 12:09:50 +0000 (04:09 -0800)]
Merge pull request #5801 from Rovanion/default-doc
Added example defaults file and appropriate documentation.
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:48:00 +0000 (13:48 +0200)]
Even more data: confirm
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:46:50 +0000 (13:46 +0200)]
More data: confirm
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:41:38 +0000 (13:41 +0200)]
Fix project models specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:38:31 +0000 (13:38 +0200)]
Fix markdown helper spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:35:10 +0000 (13:35 +0200)]
Fix signup for rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:24:48 +0000 (13:24 +0200)]
Fix UserProject obserse spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:20:54 +0000 (13:20 +0200)]
Fix more confirm deprecations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:20:35 +0000 (13:20 +0200)]
Fix User#by_username_or_id for postgres
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 10:08:40 +0000 (12:08 +0200)]
Remove some deprecations and fir project helper specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 08:35:54 +0000 (10:35 +0200)]
Fix wiki editing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 08:35:39 +0000 (10:35 +0200)]
Fix commits atom feed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 08:20:31 +0000 (10:20 +0200)]
fix profile tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jeroen van Baarsen [Mon, 9 Dec 2013 21:36:45 +0000 (22:36 +0100)]
Fixed some deprecations
* Model.all is deprecacted, use without .all
* confirm: message is deprecated, needed to be wrapped
in data block
Dmitriy Zaporozhets [Mon, 9 Dec 2013 21:31:25 +0000 (23:31 +0200)]
Mention assets precompile in installation docs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 9 Dec 2013 21:26:09 +0000 (23:26 +0200)]
GitLab app is not threadsafe so better disable allow_concurrency for production env
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 9 Dec 2013 21:17:03 +0000 (23:17 +0200)]
Fixed mistake and mock warning
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 9 Dec 2013 21:03:14 +0000 (23:03 +0200)]
Add rails4 to travis
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jeroen van Baarsen [Mon, 9 Dec 2013 20:51:01 +0000 (21:51 +0100)]
Fixed rails 4 deprecation warnings in groups
Jeroen van Baarsen [Mon, 9 Dec 2013 19:50:36 +0000 (20:50 +0100)]
Upgraded the grape gem
Jeroen van Baarsen [Mon, 9 Dec 2013 19:02:36 +0000 (20:02 +0100)]
Fixed the last deprecation warnings for order and where
Jeroen van Baarsen [Mon, 9 Dec 2013 18:29:39 +0000 (19:29 +0100)]
Fixed some deprecation warnings
Jeroen van Baarsen [Mon, 9 Dec 2013 17:40:55 +0000 (18:40 +0100)]
Fixed default scope deprecation warning
Jeroen van Baarsen [Mon, 9 Dec 2013 17:39:30 +0000 (18:39 +0100)]
Fixed the WhiningNill deprecation fix
OSDN Git Service
