Commit graph

4451 commits

Author SHA1 Message Date
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
Sato Hiroyuki
f8009a4858 Fix spinach errors. 2013-03-01 17:28:29 +09: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
Andrew8xx8
cff845784e Show Issues tracker select only if one or more remote issue trackers available 2013-02-28 16:11:14 +04:00
Andrew8xx8
8caccae454 Issue helper tests improved 2013-02-28 16:11:14 +04:00
Andrew8xx8
b6d0f2852d Issues link from project page follows on remote bug tracker if it selected now 2013-02-28 16:11:14 +04:00
Andrew8xx8
ab98db73a3 Issues tracker settings enableds/disableds without page reloading now 2013-02-28 16:11:14 +04:00
Andrew8xx8
bca72eac74 Default issue tracker name added to gon variables 2013-02-28 16:11:14 +04:00
Andrew8xx8
cf3cf3750e Gem gon added. It produces server-side variable values in javascript 2013-02-28 16:11:14 +04:00
Andrew8xx8
c6385e4135 Section name returned back to base 2013-02-28 16:11:13 +04:00
Andrew8xx8
c643b50dbd Default value for issues_tracker setting added 2013-02-28 16:11:13 +04:00
Andrew8xx8
9b606ede00 Wrong default section in config. Fixed. 2013-02-28 16:11:13 +04:00
Andrew8xx8
9e8a818696 Issues helper included to markdown helper 2013-02-28 16:11:13 +04:00
Andrew8xx8
16c720fd96 Issues helper improved 2013-02-28 16:11:13 +04:00