Commits · f0a417df38e64de365d03b980918173196cac62d · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

14 Mar, 2014 9 commits
- Merge branch 'dzaporozhets/gitlabhq-import-timeout' · f0a417df
  Dmitriy Zaporozhets authored Mar 14, 2014
  
  f0a417df
- Fix specs · ac6b9faf
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ac6b9faf
- Fix project creation test · b007cadf
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b007cadf
- Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq… · 0d7986a8
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	db/schema.rb
```
  0d7986a8
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 58e4e6b0
  Dmitriy Zaporozhets authored Mar 14, 2014
  
  58e4e6b0
- Override rake test · 8839339e
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8839339e
- Merge pull request #6526 from mavimo/patch-1 · cad79433
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Fixed error on mysql install link
```
  cad79433
- Merge pull request #6527 from tsigo/quieter-test-output · 9b36941f
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Quieter test output
```
  9b36941f
- Override rake spec and rake spinach tasks · f6f80659
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f6f80659
13 Mar, 2014 23 commits
- TestEnv.reset_satellite_dir should run 'git clean' quietly · 09834380
  Robert Speicher authored Mar 13, 2014
```
Removes the "Removing gitlabhq" messages cluttering spec output
```
  09834380
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 50670948
  Dmitriy Zaporozhets authored Mar 13, 2014
  
  50670948
- Update changelog · 632fe8fb
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  632fe8fb
- Correct BackgroundJobs page for both OSX and linux · 65cb88f3
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  65cb88f3
- Merge branch 'toggle_diff_comments' of… · 2a7da96a
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/stylesheets/sections/commits.scss
	app/assets/stylesheets/sections/notes.scss
	app/views/projects/commits/_diffs.html.haml
	features/steps/project/merge_requests.rb
```
  2a7da96a
- Fixed error on mysql install link · 599ee967
  Marco Vito Moscaritolo authored Mar 13, 2014
```
Fixed error on install guide to mysql conf page.
```
  599ee967
- Merge pull request #6360 from jvanbaarsen/fix-6328-expose-username · 6f5a9b41
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Also expose username for the /discover endpoint
```
  6f5a9b41
- Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn… · c8e1c53f
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn into cirosantilli-rm-dir-prefix
```
  c8e1c53f
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 3f2d9410
  Dmitriy Zaporozhets authored Mar 13, 2014
  
  3f2d9410
- Merge pull request #6523 from jvanbaarsen/patch-4 · 88742aea
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Added entry for the new webhook
```
  88742aea
- Merge branch 'tighten_logrotate' into 'master' · 3082d2a4
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Tighten Logrotate
```
  3082d2a4
- Merge branch 'patch_update_robustness' into 'master' · 42ef81be
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Patch Update Robustness
```
  42ef81be
- Mention retry feature for repository import in CHANGELOG · 9064fba0
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9064fba0
- Remove default value for Project#imported · d1bee5e3
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d1bee5e3
- Update httparty · 494dc8ca
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  494dc8ca
- Added entry for the new webhook · b4edf4f9
  Jeroen van Baarsen authored Mar 13, 2014
  
  b4edf4f9
- Create event and clear cache on new trag push · 5be42456
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5be42456
- Use gitlab:setup inside gitlab:test · b0a86cb3
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b0a86cb3
- Add migration for already imported projects · 10c0cb8c
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  10c0cb8c
- Add mysql limits to db during setup · 46cc3b22
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  46cc3b22
- Fix BackgroundJobs page · c4263dfb
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c4263dfb
- Hide retry import form for non masters · 44c94039
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  44c94039
- Redirect to import page from show when import in progress · aaff3566
  Dmitriy Zaporozhets authored Mar 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  aaff3566
12 Mar, 2014 8 commits
- Add retry feature to project import · b47646ef
  Dmitriy Zaporozhets authored Mar 12, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b47646ef
- Project import and retry import scaffold · 37db76a3
  Dmitriy Zaporozhets authored Mar 12, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  37db76a3
- Add project import state machine · 1436433c
  Dmitriy Zaporozhets authored Mar 12, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1436433c
- Move project creation to service · 7f50c7f6
  Dmitriy Zaporozhets authored Mar 12, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7f50c7f6
- Add Project#import_status field · e603da73
  Dmitriy Zaporozhets authored Mar 12, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e603da73
- Update the logrotate configuration in 6.7 · 85a4d1ec
  Jacob Vosmaer authored Mar 12, 2014
  
  85a4d1ec
- Add 6.6-to-6.7.md update guide · 3e6fe8bf
  Jacob Vosmaer authored Mar 12, 2014
  
  3e6fe8bf
- Logrotate daily, keeping 90 days of old logs · c22646d2
  Jacob Vosmaer authored Mar 12, 2014
```
Also remove the 'delaycompress' option which is not needed because we
use 'copytruncate'.
```
  c22646d2