Commit Graph
5596 Commits
Author SHA1 Message Date
Ariejan de Vroom 2b4bebd9f2 Doc: set permission on config.database.yml 2013-06-29 17:31:08 +03:00
Ariejan de Vroom b8ce544703 Merge branch 'bbodenmiller-master'
Closes #4331
2013-06-29 17:19:15 +03:00
Ariejan de Vroom ab36cdec84 Tweak wording and phrasing 2013-06-29 17:19:10 +03:00
Ariejan de Vroom 729c74320a Merge branch 'master' of git://github.com/bbodenmiller/gitlabhq into bbodenmiller-master 2013-06-29 17:13:47 +03:00
Ariejan de Vroom 7fb9047223 Merge branch 'muskox-master'
Closes #4424
2013-06-29 16:37:51 +03:00
Scott PustayandAriejan de Vroom 2000f013f7 fixed typo in assgned 2013-06-29 16:37:41 +03:00
Dmitriy Zaporozhets 7ae72e6511 Merge pull request #4323 from axilleas/update_docs
Create uploads dir otherwise backup fails. Fix #4304
2013-06-28 21:55:13 -07:00
Dmitriy Zaporozhets d0779d61d3 Merge pull request #4239 from karlhungus/feature-alt-text-for-gravatars
Gravatar image fixes when gravatar unavailable
2013-06-26 10:10:14 -07:00
Izaak Alpert d1da45e1a3 Rebasing on master
Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3
2013-06-26 11:08:55 -04:00
Izaak Alpert c1b05e7b86 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
2013-06-26 08:53:03 -04:00
Dmitriy Zaporozhets 579c0b9791 Merge pull request #4393 from dosire/scrum-improvements
Rename unspecified to make it clearer and in line with scrum terminology
2013-06-25 23:24:38 -07:00
Dmitriy Zaporozhets 743c232b16 Merge pull request #4412 from senny/fix_bad_constant_reference
fix bad constant reference in `project_routing_spec.rb`.
2013-06-25 22:57:33 -07:00
Yves Senn 95353aa6c4 Merge pull request #4419 from jlgeering/master
whitespaces in gitlab.yml.example
2013-06-25 22:55:13 -07:00
Dmitriy Zaporozhets f7199bb1fb Merge pull request #4361 from kenips/master
Add missing assigned_to renaming to merge_requests_load_context
2013-06-25 22:12:29 -07:00
Jean-Luc Geering 01d694aaba whitespaces in gitlab.yml.example 2013-06-25 14:01:41 +03:00
Dmitriy Zaporozhets a01db3d636 Merge branch 'contributing-pull-requests' of /home/git/repositories/gitlab/gitlabhq 2013-06-25 06:18:07 +00:00
Dmitriy Zaporozhets 059baa09f9 Merge branch 'gem-update-policy' of /home/git/repositories/gitlab/gitlabhq 2013-06-25 06:17:54 +00:00
Dmitriy Zaporozhets 6d15e64588 Merge branch 'animated-gif' of /home/git/repositories/gitlab/gitlabhq 2013-06-25 06:17:14 +00:00
Yves Senn 3b9e3021ee fix bad constant reference in project_routing_spec.rb. 2013-06-24 18:57:49 +02:00
Sytse Sijbrandij 32e029d261 Detail gem update policy. 2013-06-24 18:54:08 +02:00
Dmitriy Zaporozhets 884498c59f Merge pull request #4410 from senny/dont_console_log_in_code
we should not use `console.log` in production code...
2013-06-24 08:43:53 -07:00
Yves Senn f3a9240237 we should not use console.log in production code... 2013-06-24 17:40:23 +02:00
Dmitriy Zaporozhets 20ed39e781 Merge pull request #3898 from jacargentina/notifymentioned
Notify email to mentioned users; show participants ala github on issuables
2013-06-24 08:20:58 -07:00
Javier Castro cf35d19c2e Show participants on issues, including mentions, and notify email to all participants 2013-06-24 11:55:44 -03:00
Dmitriy Zaporozhets a324960d92 Merge pull request #4407 from jackbot/master
Database seeding failing
2013-06-24 06:56:07 -07:00
Jack Weeden 905eb17614 Merge branch 'master' of github.com:jackbot/gitlabhq 2013-06-24 14:53:40 +01:00
Jack Weeden a5d6bbe0af cattr_accessor removed from IssueObserver and MergeRequestObserver but not updated in fixtures 2013-06-24 14:21:46 +01:00
Sytse Sijbrandij 04e77826ba Notes about what PR's we would like to see. 2013-06-24 09:20:08 +02:00
Yves Senn b8eee565a8 Merge pull request #4369 from zeehio/patch-1
[Doc] Update 5.0 to 5.1: Recompile assets
2013-06-24 00:12:12 -07:00
Sytse Sijbrandij 862fbb62b2 Add animated screenshots. 2013-06-23 21:54:24 +02:00
Sytse Sijbrandij ef629ab47e Rename unspecified to make it clearer and in line with scrum terminology. 2013-06-22 17:19:00 +02:00
Dmitriy Zaporozhets ac6c912860 Merge pull request #4385 from Razer6/fix_update_docs_for_master
Fix wrong file versions in update docs (5.2 to 5.3)
2013-06-22 04:45:41 -07:00
Robert Schilling 8c1ac6f3c6 Fix wrong file versions in update docs 2013-06-22 13:29:51 +02:00
Dmitriy Zaporozhets f4e2865d2f Merge pull request #3408 from NARKOZ/patch-2
add db index for authentication_token column in users table
2013-06-22 01:14:07 -07:00
Dmitriy Zaporozhets a962217db8 Merge branch 'install-guide-improvements' of /home/git/repositories/gitlab/gitlabhq 2013-06-21 19:49:14 +00:00
Sytse Sijbrandij 76f2e065ea Merge branch 'master' into install-guide-improvements
Conflicts:
	doc/install/installation.md
2013-06-21 21:18:20 +02:00
Sergio Oller 98423a37b2 [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.
2013-06-21 11:05:21 +02:00
Ken Ip ed25ddca7a Fix missing assigned_to renaming in 2e839ce
fixes #4360.
2013-06-20 13:21:04 -04:00
Dmitriy Zaporozhets 48d372725a Update docs from 5.2 to 5.3 2013-06-20 09:52:47 +03:00
Dmitriy Zaporozhets 148eade9d7 Version to 5.3 v5.3.0 2013-06-19 19:57:32 +03:00
Dmitriy Zaporozhets d899fcdd2d Merge pull request #4325 from zzet/patch-1
Remove unused but slow code
2013-06-18 11:31:17 -07:00
Dmitriy Zaporozhets cc5440e82a Use navless layout for snippets page 2013-06-18 17:43:49 +03:00
Ben Bodenmiller d3cd2b7598 contributing guideline updates
* updated close policy
* added line on courtesy & respect to volunteers
* request that issue information be placed in first issue post
2013-06-18 01:59:08 -07:00
Dmitriy Zaporozhets 68b601f6af Fix Issue.open_for 2013-06-17 20:00:50 +03:00
Yves Senn ed9b661c9d Merge pull request #4279 from barendt/patch-2
Fix paths to the Contents Markdown pages
2013-06-17 06:05:10 -07:00
Andrew Kumanyaev 26994b5d30 Remove unused, but slow code 2013-06-17 15:52:54 +04:00
Dmitriy Zaporozhets 2e839cee93 Fixed tests. Fixed overrided scope. Better usability for milestone view 2013-06-17 11:57:37 +03:00
Axilleas Pipinellis ddc57ece6b Create uploads dir otherwise backup fails. Fix #4304 2013-06-17 11:38:27 +03:00
Dmitriy Zaporozhets b1bdd82992 Merge pull request #4269 from dosire/scrum-view-for-milestone
Scrum view style milestone view.
2013-06-16 23:32:09 -07:00
Sytse Sijbrandij 8ccad7c3c7 Fix spelling error and make sure you never log in as git user so you never have to logout to run sudo. 2013-06-16 22:06:33 +02:00