OSDN Git Service
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:49:29 +0000 (13:49 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:48:03 +0000 (13:48 +0300)]
Sanitize user attrs on model level
Yves Senn [Tue, 9 Jul 2013 18:21:18 +0000 (11:21 -0700)]
Merge pull request #4519 from kwongius/team-assignment-text
Fix header text for setting greatest team access to a project
Kevin Wong [Tue, 9 Jul 2013 16:42:35 +0000 (10:42 -0600)]
Fix header text for setting greatest team access to a project
Dmitriy Zaporozhets [Mon, 8 Jul 2013 17:36:21 +0000 (17:36 +0000)]
Merge branch 'change-to-default-installer' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Mon, 8 Jul 2013 16:52:10 +0000 (18:52 +0200)]
Use default system editor.
Dmitriy Zaporozhets [Mon, 8 Jul 2013 10:59:56 +0000 (13:59 +0300)]
Added new entries to changelog. Version up to 5.4.0.pre
Dmitriy Zaporozhets [Mon, 8 Jul 2013 10:22:12 +0000 (03:22 -0700)]
Merge pull request #4508 from Razer6/fix_broken_api_links
Fix broken API links, fixes #4463
Dmitriy Zaporozhets [Mon, 8 Jul 2013 06:47:31 +0000 (09:47 +0300)]
Add suppoort of unicorn and fog gems
Dmitriy Zaporozhets [Mon, 8 Jul 2013 06:29:14 +0000 (06:29 +0000)]
Merge branch 'rename-support-forum-to-mailing-list' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 7 Jul 2013 21:22:21 +0000 (00:22 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Yves Senn [Sun, 7 Jul 2013 11:49:28 +0000 (04:49 -0700)]
Merge pull request #4509 from bbodenmiller/cont-updates
minor contributing guide updates
Ben Bodenmiller [Sun, 7 Jul 2013 11:46:37 +0000 (04:46 -0700)]
minor contributing guide updates
* issues & pr in English
* appropriate language
* typo & format fix
* not catch all pull request
* update changelog
Robert Schilling [Sun, 7 Jul 2013 10:35:37 +0000 (12:35 +0200)]
Fix broken API links, fixes #4463
Sytse Sijbrandij [Sun, 7 Jul 2013 09:30:31 +0000 (11:30 +0200)]
Rename support forum to mailing list to prevent duplication on community page of GitLab.org.
Dmitriy Zaporozhets [Sat, 6 Jul 2013 09:38:04 +0000 (02:38 -0700)]
Merge pull request #4505 from m4tthumphrey/patch-1
Added client list to API doc
Matt Humphrey [Sat, 6 Jul 2013 09:14:06 +0000 (10:14 +0100)]
Added client list to API doc
Yves Senn [Thu, 4 Jul 2013 11:28:53 +0000 (04:28 -0700)]
Merge pull request #4476 from tstone2077/master
Updating documentation to reflect #3836 (resolving #4443)
Dmitriy Zaporozhets [Thu, 4 Jul 2013 11:08:33 +0000 (11:08 +0000)]
Merge branch 'puma_cluster_recommendation' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Thu, 4 Jul 2013 09:09:19 +0000 (11:09 +0200)]
Add cluster mode instructions to puma.rb.example
Dmitriy Zaporozhets [Wed, 3 Jul 2013 19:03:39 +0000 (12:03 -0700)]
Merge pull request #4484 from Razer6/add_services_to_blacklist
Add 'services' to path blacklist
Yves Senn [Wed, 3 Jul 2013 17:43:50 +0000 (10:43 -0700)]
Merge pull request #4488 from dekimsey/patch-1
Fix misspelling in social accounts tip
dekimsey [Wed, 3 Jul 2013 17:34:23 +0000 (13:34 -0400)]
Fix misspelling in social accounts tip
Robert Schilling [Wed, 3 Jul 2013 10:57:35 +0000 (12:57 +0200)]
Add 'services' to path blacklist, fixes #4470
Yves Senn [Wed, 3 Jul 2013 07:00:14 +0000 (00:00 -0700)]
Merge pull request #4482 from kivlor/patch-1
move 'make config/database.yml readable to git only' instruction
Andrew Gallagher [Wed, 3 Jul 2013 05:15:50 +0000 (15:15 +1000)]
move 'make config/database.yml readable to git only' instruction
I've moved the instruction in question to the the
'Configure GitLab DB settings'. Can't change permission to a file that doesn't already exist :wink:
Dmitriy Zaporozhets [Tue, 2 Jul 2013 08:43:40 +0000 (08:43 +0000)]
Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 2 Jul 2013 08:42:39 +0000 (11:42 +0300)]
Fix header avatar
Dmitriy Zaporozhets [Tue, 2 Jul 2013 08:41:28 +0000 (01:41 -0700)]
Merge pull request #4440 from jackbot/editable-notes
Editable notes
Jacob Vosmaer [Tue, 2 Jul 2013 08:27:51 +0000 (10:27 +0200)]
Warn that relative URL's are unsupported
GitLab [Tue, 2 Jul 2013 02:14:39 +0000 (21:14 -0500)]
Updating documentation to reflect #3836 (resolving #4443)
Jack Weeden [Tue, 25 Jun 2013 22:46:07 +0000 (23:46 +0100)]
Add editable notes feature
Jack Weeden [Sun, 30 Jun 2013 16:44:59 +0000 (17:44 +0100)]
Changed 'javascript:;' links to '#'
Jack Weeden [Wed, 26 Jun 2013 15:25:24 +0000 (16:25 +0100)]
Removed before_filter as authentication is done within update method
Jack Weeden [Wed, 26 Jun 2013 15:01:59 +0000 (16:01 +0100)]
Authorize user on note update
Jack Weeden [Wed, 26 Jun 2013 14:32:34 +0000 (15:32 +0100)]
Ability to edit comments
Jack Weeden [Wed, 26 Jun 2013 10:27:49 +0000 (10:27 +0000)]
Prevent 'toplevel constant SnippetsController referenced by Project::SnippetsController' warning
Jack Weeden [Tue, 25 Jun 2013 22:46:07 +0000 (23:46 +0100)]
Added update and delete_attachment actions to note controller
Jack Weeden [Mon, 1 Jul 2013 09:43:01 +0000 (10:43 +0100)]
Merge remote-tracking branch 'upstream/master'
Dmitriy Zaporozhets [Sun, 30 Jun 2013 16:32:47 +0000 (09:32 -0700)]
Merge pull request #4415 from jackbot/master
Couple of UI additions
Dmitriy Zaporozhets [Sun, 30 Jun 2013 16:32:04 +0000 (09:32 -0700)]
Merge pull request #4442 from 1ed/projects-helper-fix
fixed nav bar for empty repos (fixes #4375)
Dmitriy Zaporozhets [Sun, 30 Jun 2013 08:22:21 +0000 (01:22 -0700)]
Merge pull request #4460 from tstone2077/feature_help_markdown
Adding detailed documentation of the markdown syntax.
Dmitriy Zaporozhets [Sun, 30 Jun 2013 08:20:57 +0000 (11:20 +0300)]
Fixed db/schema.rb
Ariejan de Vroom [Sat, 29 Jun 2013 14:31:08 +0000 (17:31 +0300)]
Doc: set permission on config.database.yml
Ariejan de Vroom [Sat, 29 Jun 2013 14:19:15 +0000 (17:19 +0300)]
Merge branch 'bbodenmiller-master'
Closes #4331
Ariejan de Vroom [Sat, 29 Jun 2013 14:19:10 +0000 (17:19 +0300)]
Tweak wording and phrasing
Ariejan de Vroom [Sat, 29 Jun 2013 14:13:47 +0000 (17:13 +0300)]
Merge branch 'master' of git://github.com/bbodenmiller/gitlabhq into bbodenmiller-master
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
Thurston Stone [Thu, 27 Jun 2013 21:58:43 +0000 (16:58 -0500)]
Adding detailed documentation of the markdown syntax.
This includes standard markdown as well as GitLab extended markdown as well as references to documents used.
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
Gábor Egyed [Sun, 23 Jun 2013 18:39:46 +0000 (20:39 +0200)]
fixed nav bar for empty repos (fixes #4375)
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
vagrant [Tue, 25 Jun 2013 09:05:02 +0000 (09:05 +0000)]
Merge remote-tracking branch 'upstream/master'
Jack Weeden [Tue, 25 Jun 2013 08:49:09 +0000 (09:49 +0100)]
Don't show 'Filter by labels' text if there are no labels
Don't show project search form if there are no projects
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
Jack Weeden [Mon, 24 Jun 2013 22:57:26 +0000 (23:57 +0100)]
Added tooltip to snippet public/private icons
Jack Weeden [Mon, 24 Jun 2013 22:55:37 +0000 (23:55 +0100)]
Added delete button to snippet view
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
Ben Bodenmiller [Tue, 18 Jun 2013 08:59:08 +0000 (01:59 -0700)]
contributing guideline updates
* updated close policy
* added line on courtesy & respect to volunteers
* request that issue information be placed in first issue post
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