OSDN Git Service
Ariejan de Vroom [Sat, 29 Jun 2013 13:37:51 +0000 (16:37 +0300)]
Merge branch 'muskox-master'
Closes #4424
Scott Pustay [Tue, 25 Jun 2013 18:32:28 +0000 (11:32 -0700)]
fixed typo in assgned
Dmitriy Zaporozhets [Sat, 29 Jun 2013 04:55:13 +0000 (21:55 -0700)]
Merge pull request #4323 from axilleas/update_docs
Create uploads dir otherwise backup fails. Fix #4304
Dmitriy Zaporozhets [Wed, 26 Jun 2013 17:10:14 +0000 (10:10 -0700)]
Merge pull request #4239 from karlhungus/feature-alt-text-for-gravatars
Gravatar image fixes when gravatar unavailable
Izaak Alpert [Wed, 26 Jun 2013 14:00:21 +0000 (10:00 -0400)]
Rebasing on master
Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3
Izaak Alpert [Thu, 6 Jun 2013 16:02:58 +0000 (12:02 -0400)]
Gravatar image fixes when gravatar unavailable
-Alt text to image was set to hash, which would make the page display hashes if the image/gravatar wasn't available, set the alt text to '', and made the main tool bar image follow the same or similar constraints as the other images (.avatar, .s26)
Conflicts:
app/assets/stylesheets/themes/ui_bb.scss
app/views/snippets/_snippet.html.haml
Change-Id: I42e1e86f535486fd2556d4b3e4591f3676eea033
Dmitriy Zaporozhets [Wed, 26 Jun 2013 06:24:38 +0000 (23:24 -0700)]
Merge pull request #4393 from dosire/scrum-improvements
Rename unspecified to make it clearer and in line with scrum terminology
Dmitriy Zaporozhets [Wed, 26 Jun 2013 05:57:33 +0000 (22:57 -0700)]
Merge pull request #4412 from senny/fix_bad_constant_reference
fix bad constant reference in `project_routing_spec.rb`.
Yves Senn [Wed, 26 Jun 2013 05:55:13 +0000 (22:55 -0700)]
Merge pull request #4419 from jlgeering/master
whitespaces in gitlab.yml.example
Dmitriy Zaporozhets [Wed, 26 Jun 2013 05:12:29 +0000 (22:12 -0700)]
Merge pull request #4361 from kenips/master
Add missing assigned_to renaming to merge_requests_load_context
Jean-Luc Geering [Tue, 25 Jun 2013 11:01:41 +0000 (14:01 +0300)]
whitespaces in gitlab.yml.example
Dmitriy Zaporozhets [Tue, 25 Jun 2013 06:18:07 +0000 (06:18 +0000)]
Merge branch 'contributing-pull-requests' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 25 Jun 2013 06:17:54 +0000 (06:17 +0000)]
Merge branch 'gem-update-policy' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 25 Jun 2013 06:17:14 +0000 (06:17 +0000)]
Merge branch 'animated-gif' of /home/git/repositories/gitlab/gitlabhq
Yves Senn [Mon, 24 Jun 2013 16:57:49 +0000 (18:57 +0200)]
fix bad constant reference in `project_routing_spec.rb`.
Sytse Sijbrandij [Mon, 24 Jun 2013 16:54:08 +0000 (18:54 +0200)]
Detail gem update policy.
Dmitriy Zaporozhets [Mon, 24 Jun 2013 15:43:53 +0000 (08:43 -0700)]
Merge pull request #4410 from senny/dont_console_log_in_code
we should not use `console.log` in production code...
Yves Senn [Mon, 24 Jun 2013 15:40:23 +0000 (17:40 +0200)]
we should not use `console.log` in production code...
Dmitriy Zaporozhets [Mon, 24 Jun 2013 15:20:58 +0000 (08:20 -0700)]
Merge pull request #3898 from jacargentina/notifymentioned
Notify email to mentioned users; show participants ala github on issuables
Javier Castro [Thu, 9 May 2013 23:37:47 +0000 (20:37 -0300)]
Show participants on issues, including mentions, and notify email to all participants
Dmitriy Zaporozhets [Mon, 24 Jun 2013 13:56:07 +0000 (06:56 -0700)]
Merge pull request #4407 from jackbot/master
Database seeding failing
Jack Weeden [Mon, 24 Jun 2013 13:53:40 +0000 (14:53 +0100)]
Merge branch 'master' of github.com:jackbot/gitlabhq
Jack Weeden [Mon, 24 Jun 2013 13:21:46 +0000 (14:21 +0100)]
cattr_accessor removed from IssueObserver and MergeRequestObserver but not updated in fixtures
Sytse Sijbrandij [Mon, 24 Jun 2013 07:20:08 +0000 (09:20 +0200)]
Notes about what PR's we would like to see.
Yves Senn [Mon, 24 Jun 2013 07:12:12 +0000 (00:12 -0700)]
Merge pull request #4369 from zeehio/patch-1
[Doc] Update 5.0 to 5.1: Recompile assets
Sytse Sijbrandij [Sun, 23 Jun 2013 19:54:24 +0000 (21:54 +0200)]
Add animated screenshots.
Sytse Sijbrandij [Sat, 22 Jun 2013 15:19:00 +0000 (17:19 +0200)]
Rename unspecified to make it clearer and in line with scrum terminology.
Dmitriy Zaporozhets [Sat, 22 Jun 2013 11:45:41 +0000 (04:45 -0700)]
Merge pull request #4385 from Razer6/fix_update_docs_for_master
Fix wrong file versions in update docs (5.2 to 5.3)
Robert Schilling [Sat, 22 Jun 2013 11:29:51 +0000 (13:29 +0200)]
Fix wrong file versions in update docs
Dmitriy Zaporozhets [Sat, 22 Jun 2013 08:14:07 +0000 (01:14 -0700)]
Merge pull request #3408 from NARKOZ/patch-2
add db index for authentication_token column in users table
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:49:14 +0000 (19:49 +0000)]
Merge branch 'install-guide-improvements' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Fri, 21 Jun 2013 19:18:20 +0000 (21:18 +0200)]
Merge branch 'master' into install-guide-improvements
Conflicts:
doc/install/installation.md
Sergio Oller [Fri, 21 Jun 2013 09:05:21 +0000 (11:05 +0200)]
[Doc] Update 5.0 to 5.1: Recompile assets
Recompiling assets on the update is needed or main menu appearance may not load properly. This has been mentioned on issues #3722 and #3978.
The command has been tested several by users on those issues and by myself.
Thanks for your time and attention.
Ken Ip [Thu, 20 Jun 2013 17:21:04 +0000 (13:21 -0400)]
Fix missing assigned_to renaming in
2e839ce
fixes #4360.
Dmitriy Zaporozhets [Thu, 20 Jun 2013 06:51:09 +0000 (09:51 +0300)]
Update docs from 5.2 to 5.3
Dmitriy Zaporozhets [Wed, 19 Jun 2013 16:57:32 +0000 (19:57 +0300)]
Version to 5.3
Dmitriy Zaporozhets [Tue, 18 Jun 2013 18:31:17 +0000 (11:31 -0700)]
Merge pull request #4325 from zzet/patch-1
Remove unused but slow code
Dmitriy Zaporozhets [Tue, 18 Jun 2013 14:43:49 +0000 (17:43 +0300)]
Use navless layout for snippets page
Dmitriy Zaporozhets [Mon, 17 Jun 2013 10:29:50 +0000 (13:29 +0300)]
Fix Issue.open_for
Yves Senn [Mon, 17 Jun 2013 13:05:10 +0000 (06:05 -0700)]
Merge pull request #4279 from barendt/patch-2
Fix paths to the Contents Markdown pages
Andrew Kumanyaev [Mon, 17 Jun 2013 11:52:54 +0000 (15:52 +0400)]
Remove unused, but slow code
Dmitriy Zaporozhets [Mon, 17 Jun 2013 08:57:37 +0000 (11:57 +0300)]
Fixed tests. Fixed overrided scope. Better usability for milestone view
Axilleas Pipinellis [Mon, 17 Jun 2013 08:38:27 +0000 (11:38 +0300)]
Create uploads dir otherwise backup fails. Fix #4304
Dmitriy Zaporozhets [Mon, 17 Jun 2013 06:32:09 +0000 (23:32 -0700)]
Merge pull request #4269 from dosire/scrum-view-for-milestone
Scrum view style milestone view.
Sytse Sijbrandij [Sun, 16 Jun 2013 20:06:33 +0000 (22:06 +0200)]
Fix spelling error and make sure you never log in as git user so you never have to logout to run sudo.
Dmitriy Zaporozhets [Sat, 15 Jun 2013 10:10:43 +0000 (13:10 +0300)]
FIx userteams tests
Nihad Abbasov [Tue, 26 Mar 2013 14:34:32 +0000 (07:34 -0700)]
add db index for authentication_token column in users table
Dmitriy Zaporozhets [Fri, 14 Jun 2013 16:58:16 +0000 (19:58 +0300)]
Fix MR feature
Dmitriy Zaporozhets [Fri, 14 Jun 2013 14:19:26 +0000 (17:19 +0300)]
Check for existing MR only for opened/reopened MR
Dmitriy Zaporozhets [Fri, 14 Jun 2013 13:30:48 +0000 (16:30 +0300)]
Add imported boolean to project. Prevent shell from creating repo after it was imported
Dmitriy Zaporozhets [Fri, 14 Jun 2013 12:20:22 +0000 (05:20 -0700)]
Merge pull request #4314 from Undev/feature/redesign_forms
Switch form from table to plain form without member list
Dmitriy Zaporozhets [Fri, 14 Jun 2013 12:17:47 +0000 (15:17 +0300)]
IMprove MR validation logic
Sytse Sijbrandij [Fri, 14 Jun 2013 12:13:14 +0000 (14:13 +0200)]
Implement (style) suggestions.
Dmitriy Zaporozhets [Fri, 14 Jun 2013 12:03:22 +0000 (15:03 +0300)]
Prevent creating several open merge requests for same branches
Dmitriy Zaporozhets [Fri, 14 Jun 2013 11:42:55 +0000 (14:42 +0300)]
Refactor grack auth module. Add git over http wiki support
Andrey Kumanyaev [Fri, 14 Jun 2013 11:08:21 +0000 (15:08 +0400)]
Switch for from table to plain form without member list
Dmitriy Zaporozhets [Fri, 14 Jun 2013 09:58:12 +0000 (12:58 +0300)]
Fix mailer test
Dmitriy Zaporozhets [Fri, 14 Jun 2013 05:37:55 +0000 (08:37 +0300)]
Fix tab tests. Prevent 500 if user.last_sign_in_at is nil
Dmitriy Zaporozhets [Thu, 13 Jun 2013 19:58:27 +0000 (22:58 +0300)]
Move project nav checks to helper
Dmitriy Zaporozhets [Thu, 13 Jun 2013 18:09:26 +0000 (18:09 +0000)]
Merge branch 'feature/password_expire' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 13 Jun 2013 18:06:27 +0000 (21:06 +0300)]
Force user password change for users created by admin
Dmitriy Zaporozhets [Thu, 13 Jun 2013 17:21:51 +0000 (20:21 +0300)]
Prevent infinit password change by settin password_expires_at to nil
Dmitriy Zaporozhets [Thu, 13 Jun 2013 17:16:48 +0000 (20:16 +0300)]
Fix password set form and infinite loop
Dmitriy Zaporozhets [Thu, 13 Jun 2013 17:06:33 +0000 (20:06 +0300)]
Force admin to change password after first sign-in
Dmitriy Zaporozhets [Thu, 13 Jun 2013 17:01:35 +0000 (20:01 +0300)]
Add password_expires_at to users table
Dmitriy Zaporozhets [Thu, 13 Jun 2013 16:56:26 +0000 (19:56 +0300)]
Better naming for some project tabs
Dmitriy Zaporozhets [Thu, 13 Jun 2013 16:53:04 +0000 (19:53 +0300)]
Password expire: implement password resource inside profile. add before_fiter check
Dmitriy Zaporozhets [Thu, 13 Jun 2013 14:47:04 +0000 (17:47 +0300)]
use bold font for active tab
Dmitriy Zaporozhets [Thu, 13 Jun 2013 14:41:21 +0000 (17:41 +0300)]
Better commit button after file edit
Dmitriy Zaporozhets [Thu, 13 Jun 2013 07:59:27 +0000 (10:59 +0300)]
Prevent overflow of comment code in event body. Add border-radius to highlight code inside note body
Dmitriy Zaporozhets [Thu, 13 Jun 2013 07:42:45 +0000 (10:42 +0300)]
Hide sign-in bottom block if no providers
Dmitriy Zaporozhets [Thu, 13 Jun 2013 07:24:01 +0000 (10:24 +0300)]
Team admin should be able to see settings tab
Dmitriy Zaporozhets [Thu, 13 Jun 2013 07:15:52 +0000 (00:15 -0700)]
Merge pull request #4296 from mmlb/fix-asciidoc-rendering
Add asciidoctor gem.
Dmitriy Zaporozhets [Thu, 13 Jun 2013 07:07:06 +0000 (10:07 +0300)]
update omniauth dependency
Dmitriy Zaporozhets [Thu, 13 Jun 2013 06:58:03 +0000 (09:58 +0300)]
Disable threadsafe! for rake tasks
Manuel Mendez [Thu, 2 May 2013 13:22:19 +0000 (10:22 -0300)]
Add asciidoctor gem.
Fixes issue #3506.
Sytse Sijbrandij [Wed, 12 Jun 2013 19:30:36 +0000 (21:30 +0200)]
Make the installation guide easier to follow for non-unix people.
Sytse Sijbrandij [Wed, 12 Jun 2013 19:30:13 +0000 (21:30 +0200)]
When stopped correctly there should be no warning about a missing socket file.
Dmitriy Zaporozhets [Wed, 12 Jun 2013 19:11:35 +0000 (22:11 +0300)]
Add path blacklist
Dmitriy Zaporozhets [Wed, 12 Jun 2013 13:43:58 +0000 (16:43 +0300)]
Fix inline diff issue. See #3150
Dmitriy Zaporozhets [Wed, 12 Jun 2013 10:43:45 +0000 (10:43 +0000)]
Merge branch 'sing-test-in-readme' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Wed, 12 Jun 2013 08:00:05 +0000 (10:00 +0200)]
Add single test to the readme, should not use rake.
Sytse Sijbrandij [Wed, 12 Jun 2013 07:59:00 +0000 (09:59 +0200)]
Incorporated the two suggestions (h5 and named variables) and fixed the Spinach test.
Dmitriy Zaporozhets [Tue, 11 Jun 2013 15:54:15 +0000 (15:54 +0000)]
Merge branch 'feature/threadsafe' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 11 Jun 2013 15:15:18 +0000 (18:15 +0300)]
cattr_accessor is not threadsafe!
Dmitriy Zaporozhets [Tue, 11 Jun 2013 15:03:13 +0000 (18:03 +0300)]
Enable threadsafe. Preload lib/
Greg Barendt [Tue, 11 Jun 2013 14:36:54 +0000 (11:36 -0300)]
Fix paths to the Contents Markdown pages
Dmitriy Zaporozhets [Tue, 11 Jun 2013 14:07:51 +0000 (07:07 -0700)]
Merge pull request #4148 from jlgeering/secure-gravatar-urls
enforce secure gravatar urls when Gitlab.config.gitlab.https is set
Dmitriy Zaporozhets [Tue, 11 Jun 2013 13:58:21 +0000 (16:58 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 11 Jun 2013 13:57:52 +0000 (16:57 +0300)]
Refactor Project.abandoned method
Dmitriy Zaporozhets [Tue, 11 Jun 2013 13:44:18 +0000 (06:44 -0700)]
Merge pull request #4176 from Andrew8xx8/patch-2
500 error on showing not existed commit fixed
Dmitriy Zaporozhets [Tue, 11 Jun 2013 12:50:25 +0000 (15:50 +0300)]
Style page for project assign to team. Fix test for admin:teams
Dmitriy Zaporozhets [Tue, 11 Jun 2013 12:39:19 +0000 (15:39 +0300)]
Restyle admin:teams:show
Dmitriy Zaporozhets [Tue, 11 Jun 2013 12:10:45 +0000 (15:10 +0300)]
mention puma cluster mode for bigger instances
Dmitriy Zaporozhets [Tue, 11 Jun 2013 11:27:27 +0000 (14:27 +0300)]
Fixed users_select_tag method
Dmitriy Zaporozhets [Tue, 11 Jun 2013 11:22:33 +0000 (14:22 +0300)]
Keep namespace name/username synced with user
Dmitriy Zaporozhets [Tue, 11 Jun 2013 11:17:37 +0000 (14:17 +0300)]
Prevent Project.all & User.all in selectboxes
Dmitriy Zaporozhets [Tue, 11 Jun 2013 10:54:58 +0000 (13:54 +0300)]
fix group:people tests after prev commit
Dmitriy Zaporozhets [Tue, 11 Jun 2013 10:51:22 +0000 (13:51 +0300)]
Group people management: replace selectbox with ajax one.
Dmitriy Zaporozhets [Tue, 11 Jun 2013 09:31:05 +0000 (12:31 +0300)]
Fix README.txt rendering. Solution by @dfyx