Commits · fe8552eff6ee444cbca11e5e80e8a9a2c16eefbc · iv / gitlab-ce

03 Mar, 2014 1 commit
- Add tests to reopen MR · fe8552ef
  Dmitriy Zaporozhets authored Mar 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fe8552ef
28 Feb, 2014 15 commits
- Feature: reopen closed merge request · 36b065e6
  Dmitriy Zaporozhets authored Feb 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  36b065e6
- Hide mr close button for comment form if merge request was closed or inline comment · 110585c5
  Dmitriy Zaporozhets authored Feb 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  110585c5
- FIx state-label align · b7072ff0
  Dmitriy Zaporozhets authored Feb 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b7072ff0
- Add bottom padding to body · 049d0cc3
  Dmitriy Zaporozhets authored Feb 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  049d0cc3
- Merge branch 'fix_backup_spec' into 'master' · ba9ff219
  Dmitriy Zaporozhets authored Feb 28, 2014
```
Fix Backup Spec
```
  ba9ff219
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 8a06144c
  Dmitriy Zaporozhets authored Feb 28, 2014
  
  8a06144c
- Fix btn margin for commit show page · 8064b3b7
  Dmitriy Zaporozhets authored Feb 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8064b3b7
- Merge pull request #6433 from boeserwolf91/patch-1 · 29fd9b40
  Sytse Sijbrandij authored Feb 28, 2014
```
fixed typo at the user management help page
```
  29fd9b40
- Make backup version blocker test more robust · 46b1c63b
  Jacob Vosmaer authored Feb 28, 2014
```
Assuming that VERSION != VERSION.reverse is not robust. This will fail
at e.g. version 6.6.6.
```
  46b1c63b
- Merge branch 'issue-improve-ui' into 'master' · 9114cfbb
  Dmitriy Zaporozhets authored Feb 28, 2014
```
Issue Improve Ui
```
  9114cfbb
- Use VERSION contanst in backup specs · b36751c8
  Jacob Vosmaer authored Feb 28, 2014
  
  b36751c8
- Revert font-smoothing to default · f4b2cee6
  Dmitriy Zaporozhets authored Feb 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f4b2cee6
- Add testme repo for dev seeds · 4710897c
  Dmitriy Zaporozhets authored Feb 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4710897c
- Add default value for Project#archived · 3dcfae75
  Dmitriy Zaporozhets authored Feb 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3dcfae75
- Merge branch 'pg_fixes' into 'master' · 5ebdbfab
  Dmitriy Zaporozhets authored Feb 28, 2014
```
Postgres fixes

For applications migrated from MySQL to PostreSQL it fixes some issues
Fixes #1060
```
  5ebdbfab
27 Feb, 2014 19 commits
- Merge branch 'gitlab_git_5_6' into 'master' · db80c149
  Dmitriy Zaporozhets authored Feb 27, 2014
```
 Use new gitlab_git gem. It makes CONTRIBUTING.md work
```
  db80c149
- Remove js tag for constantly failing test · a02c1fd3
  Dmitriy Zaporozhets authored Feb 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a02c1fd3
- Issue box restyle · 6dcfc104
  Dmitriy Zaporozhets authored Feb 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6dcfc104
- Mention ci+fork fix in CHANGELOG · 27c3d529
  Dmitriy Zaporozhets authored Feb 27, 2014
  
  27c3d529
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · aee28088
  Dmitriy Zaporozhets authored Feb 27, 2014
  
  aee28088
- Merge pull request #6359 from jasonblanchard/comment-attachment-filename · f248e4f5
  Dmitriy Zaporozhets authored Feb 27, 2014
```
Fixed attachment identifier displaying underneath note text
```
  f248e4f5
- Merge pull request #6428 from tsl0922/remove-broken-diffs · eb7cf9ba
  Dmitriy Zaporozhets authored Feb 27, 2014
```
remove dead code: broken_diffs
```
  eb7cf9ba
- Merge branch 'backup_version' into 'master' · 1f9b3f2e
  Dmitriy Zaporozhets authored Feb 27, 2014
```
Less strict backup versions
```
  1f9b3f2e
- fixed typo in user management help page · 37e21182
  Stefan Wolf authored Feb 27, 2014
  
  37e21182
- Default values for web hooks · ccd617e5
  Dmitriy Zaporozhets authored Feb 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ccd617e5
- Add default value for Project#imported boolean · 0de7a7cf
  Dmitriy Zaporozhets authored Feb 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0de7a7cf
- Use new gitlab_git gem. It makes CONTRIBUTING.md work · cac868ee
  Dmitriy Zaporozhets authored Feb 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cac868ee
- Use Gitlab::VERSION to version backups · 75f274b7
  Jacob Vosmaer authored Feb 27, 2014
```
Previous to this commit, backups were tied to the git revision (SHA1) of
the app at the time the backup:create command was invoked. If the SHA1
at the time of restore was different, the script would refuse to restore
the backup.  This commit loosens this tie so that the backup script only
complains if the value of the Gitlab::VERSION constant is different
between the time of backup and the time of restore.
```
  75f274b7
- Merge branch 'pg_force_restore' into 'master' · 0a963ee1
  Dmitriy Zaporozhets authored Feb 27, 2014
```
Pg Force Restore
```
  0a963ee1
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · b2cab1c5
  Dmitriy Zaporozhets authored Feb 27, 2014
  
  b2cab1c5
- Merge branch 'highlight_html_escape' into 'master' · 981deddf
  Dmitriy Zaporozhets authored Feb 27, 2014
```
Enable html_escape for code blocks highlighted in markdown

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/94
```
  981deddf
- html_escape is private for rails 4.0.2 :( · c94dc3de
  Dmitriy Zaporozhets authored Feb 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c94dc3de
- Enable html_escape for code blocks highlighted in markdown · 4d896a2b
  Dmitriy Zaporozhets authored Feb 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4d896a2b
- remove dead code: broken_diffs · 5c3972ae
  tsl0922 authored Feb 27, 2014
  
  5c3972ae
26 Feb, 2014 5 commits

Merge branch 'backup_restore_hooks_bug' into 'master' · b155a44e
Dmitriy Zaporozhets authored Feb 26, 2014
```
Fix backup/restore git hooks bug
```
b155a44e
Merge pull request #6416 from robbytaylor/patch-1 · 4713fc34
Dmitriy Zaporozhets authored Feb 26, 2014
```
Fixed typo in comments of apllication.scss
```
4713fc34
Merge pull request #6423 from robertd/update_changelog · 8dd0076c
Dmitriy Zaporozhets authored Feb 26, 2014
```
Updated changelog with my name for #6267
```
8dd0076c
Updated changelog with my name for #6267 · e27746f1
Robert Djurasaj authored Feb 26, 2014

e27746f1

Empty the database during Postgres backup restore · 8fe10e64

Jacob Vosmaer authored Feb 26, 2014

The expected behavior during a GitLab backup restore is to overwrite
existing database data. This works for MySQL because the output of
mysqldump contains 'DROP TABLE IF EXISTS' statements. pg_dump on the
other hand assumes that one will restore into an empty database. When
this is not the case, during the restore with psql some of the data will
be skipped if existing data is 'in the way'. By first invoking `rake
db:schema:load` during a Postgres GitLab backup restore, we make sure
that all important data is correctly restored.

8fe10e64