Commit graph

4291 commits

Author SHA1 Message Date
Dmitriy Zaporozhets 5b4032d175 Merge pull request #3118 from 2called-chaos/dont_send_mails_twice
Do not send issue status mail twice if author = assignee
2013-03-02 10:48:22 -08:00
Dmitriy Zaporozhets 62562e4d0d Merge pull request #3119 from m4tthumphrey/patch-1
Add namespace_id to project creation via API
2013-03-02 10:47:19 -08:00
Dmitriy Zaporozhets bd3848c05b Merge pull request #3124 from dosire/comprehensive-readme
Cleaned up and enhanced readme.
2013-03-02 10:45:38 -08:00
Sytse Sijbrandij 737a449795 Cleaned up and enhanced readme.
Finishing touches.

Make the layout more consistent.
2013-03-02 13:04:57 +01:00
Dmitriy Zaporozhets 907c334fe0 fix decorate call for milestone users 2013-03-02 13:23:30 +02:00
Dmitriy Zaporozhets 86da625f1d Updated gems: omniauth, sinatra, foreman 2013-03-02 12:58:47 +02:00
Matt Humphrey 1c0c7bd6e3 Missed comma. 2013-03-01 16:36:19 +00:00
Matt Humphrey dd653f62f3 Added namespace_id to project creation via API
This allows you to set the namespace ID for projects via the the API. By default it is created for the current user. You can assign it to the global namespace by passing `GLN` which translates to 'Global Namespace'.
2013-03-01 16:34:11 +00:00
Dmitriy Zaporozhets 1cfc2b6fc7 Merge branch 'Undev-team-and-group-descriptions' 2013-03-01 16:26:39 +02:00
Dmitriy Zaporozhets ef646928e4 better presenting for group description 2013-03-01 16:26:26 +02:00
Sven Pachnit c280c3ce6d Do not send issue status mail twice if author = assignee 2013-03-01 15:09:14 +01:00
Dmitriy Zaporozhets 87f555e1ef fixed db/schema 2013-03-01 16:07:55 +02:00
Dmitriy Zaporozhets 5c3cb47c16 Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions
Conflicts:
	db/schema.rb
2013-03-01 16:05:51 +02:00
Dmitriy Zaporozhets a73e58f70b draper raise now RuntimeError instead of NoMethodError 2013-03-01 15:59:43 +02:00
Dmitriy Zaporozhets dbcf4144ee use simple decorate on single commits 2013-03-01 15:35:22 +02:00
Dmitriy Zaporozhets 6aead7991f fix decorate calls on collections after draper update 2013-03-01 15:24:59 +02:00
Dmitriy Zaporozhets 520f02259c gems updated: unicorn, draper, github-markup 2013-03-01 15:15:29 +02:00
Dmitriy Zaporozhets 153a4c142d updated gems: haml-rails, carrierwave 2013-03-01 15:09:11 +02:00
Dmitriy Zaporozhets 5da7424f8d Gem updated: devise, grape, sidekiq, settingslogic 2013-03-01 14:36:12 +02:00
Dmitriy Zaporozhets 22d6ce9873 Merge pull request #3082 from devote/patch-1
Distorted lines in `diff`
2013-02-28 23:46:07 -08:00
Dmitriy Zaporozhets 0b52c461da use grit_ext 0.6.2 2013-03-01 09:23:18 +02:00
Dmitriy Zaporozhets 7a0af60b51 update stamp 2013-02-28 21:14:00 +02:00
Dmitriy Zaporozhets 547ae558d7 update httparty 2013-02-28 21:11:12 +02:00
Dmitriy Zaporozhets ed9543ff5d update devise gem 2013-02-28 21:06:16 +02:00
Dmitriy Zaporozhets 00ae65b108 try to use stable version for database cleaner 2013-02-28 21:02:41 +02:00
Dmitriy Zaporozhets 1c517153a8 fix admin users tests 2013-02-28 19:56:36 +02:00
Dmitriy Zaporozhets 9a5c152c0e Merge pull request #3114 from Un1matr1x/docs
docs improvement
2013-02-28 09:48:34 -08:00
Un1matr1x 9c40002625 docs improvement 2013-02-28 18:30:07 +01:00
Dmitriy Zaporozhets b1f58fcaea allow any attachment filenames 2013-02-28 19:29:21 +02:00
Dmitriy Zaporozhets 115454f3ed created-by-me filter for issues inside project. Fixed global project.issues order 2013-02-28 17:46:28 +02:00
Dmitriy Zaporozhets 15b121d603 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-02-28 17:10:06 +02:00
Dmitriy Zaporozhets afed5cb614 Merge branch 'Undev-link-to-issue-tracker' 2013-02-28 17:08:58 +02:00
Dmitriy Zaporozhets e1f77b9be0 Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker
Conflicts:
	Gemfile.lock
2013-02-28 17:02:20 +02:00
Andrew8xx8 2f1f05d431 Fixed notes from randx 2013-02-28 18:55:35 +04:00
Dmitriy Zaporozhets e8ff9ad2f2 Merge pull request #2249 from jouve/fix_possible_spec_failure
fix one of the possible causes of build failures
2013-02-28 06:45:16 -08:00
Dmitriy Zaporozhets d452ffc2d0 Merge branch 'features/text_mail_templates' 2013-02-28 16:43:15 +02:00
Thomas Berger 7ed0878654 added text-templates for mail notification 2013-02-28 16:39:58 +02:00
Dmitriy Zaporozhets 6682689ab2 Merge pull request #3103 from ezkl/binding-of-caller-bump
Update binding_of_caller to v0.7.1
2013-02-28 06:36:11 -08:00
Andrew8xx8 d3f042a6f2 Css classes improved 2013-02-28 18:35:27 +04:00
Dmitriy Zaporozhets 6393ed6a41 add description what is gitlab-shell 2013-02-28 16:21:58 +02:00
Dmitriy Zaporozhets dec15a4142 Add instruction to edit gitlab-shell config 2013-02-28 16:13:24 +02:00
Andrew8xx8 9c747fbb95 Missing descriptions added 2013-02-28 17:37:02 +04:00
Andrew8xx8 cf6d9a2222 Tests for team and group descriptions added 2013-02-28 17:15:22 +04:00
Andrew8xx8 9959669f1c Desctiptions removed from dashboard 2013-02-28 17:15:22 +04:00
Andrew8xx8 3d4e32457b Table description indentation fixed 2013-02-28 17:15:22 +04:00
Andrew8xx8 ba5373805a Description added to user temas factory 2013-02-28 17:15:22 +04:00
Andrew8xx8 b4648c3b52 Spinach tests fixed 2013-02-28 17:15:22 +04:00
Andrew8xx8 5f657203a1 Description added to temas 2013-02-28 17:15:22 +04:00
Andrew8xx8 9f45e01e84 Description to groups added 2013-02-28 17:14:21 +04:00
Andrew8xx8 1dab19d0d7 DB schema updated 2013-02-28 16:30:47 +04:00