home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,551 Commits 48 Branches 340 Tags
fe8552eff6ee444cbca11e5e80e8a9a2c16eefbc
Commit Graph
8551 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets fe8552eff6 Add tests to reopen MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-03 10:21:50 +02:00
Dmitriy Zaporozhets 36b065e634 Feature: reopen closed merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 22:43:16 +02:00
Dmitriy Zaporozhets 110585c503 Hide mr close button for comment form if merge request was closed or inline comment 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 22:23:08 +02:00
Dmitriy Zaporozhets b7072ff0de FIx state-label align 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 22:14:43 +02:00
Dmitriy Zaporozhets 049d0cc396 Add bottom padding to body 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 16:56:41 +02:00
Dmitriy Zaporozhets ba9ff21973 Merge branch 'fix_backup_spec' into 'master' 
Fix Backup Spec
 2014-02-28 14:21:33 +00:00
Dmitriy Zaporozhets 8a06144c94 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-28 16:19:48 +02:00
Dmitriy Zaporozhets 8064b3b767 Fix btn margin for commit show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 16:18:47 +02:00
Sytse Sijbrandij 29fd9b400e Merge pull request #6433 from boeserwolf91/patch-1 
fixed typo at the user management help page
 2014-02-28 13:56:06 +01:00
Jacob Vosmaer 46b1c63b7a Make backup version blocker test more robust 
Assuming that VERSION != VERSION.reverse is not robust. This will fail
at e.g. version 6.6.6.
 2014-02-28 12:11:43 +01:00
Dmitriy Zaporozhets 9114cfbb0a Merge branch 'issue-improve-ui' into 'master' 
Issue Improve Ui
 2014-02-28 11:07:37 +00:00
Jacob Vosmaer b36751c897 Use VERSION contanst in backup specs 2014-02-28 11:57:58 +01:00
Dmitriy Zaporozhets f4b2cee695 Revert font-smoothing to default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 10:18:49 +02:00
Dmitriy Zaporozhets 4710897c0d Add testme repo for dev seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 10:06:17 +02:00
Dmitriy Zaporozhets 3dcfae7524 Add default value for Project#archived 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 09:57:19 +02:00
Dmitriy Zaporozhets 5ebdbfab84 Merge branch 'pg_fixes' into 'master' 
Postgres fixes

For applications migrated from MySQL to PostreSQL it fixes some issues
Fixes #1060
 2014-02-28 07:02:44 +00:00
Dmitriy Zaporozhets db80c149cf Merge branch 'gitlab_git_5_6' into 'master' 
Use new gitlab_git gem. It makes CONTRIBUTING.md work
 2014-02-27 20:46:50 +00:00
Dmitriy Zaporozhets a02c1fd390 Remove js tag for constantly failing test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 21:08:02 +02:00
Dmitriy Zaporozhets 6dcfc1040d Issue box restyle 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 21:04:44 +02:00
Dmitriy Zaporozhets 27c3d529d1 Mention ci+fork fix in CHANGELOG 2014-02-27 14:48:42 +00:00
Dmitriy Zaporozhets aee28088f8 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-27 16:27:31 +02:00
Dmitriy Zaporozhets f248e4f57a Merge pull request #6359 from jasonblanchard/comment-attachment-filename 
Fixed attachment identifier displaying underneath note text
 2014-02-27 16:27:11 +02:00
Dmitriy Zaporozhets eb7cf9ba82 Merge pull request #6428 from tsl0922/remove-broken-diffs 
remove dead code: broken_diffs
 2014-02-27 16:18:05 +02:00
Dmitriy Zaporozhets 1f9b3f2e93 Merge branch 'backup_version' into 'master' 
Less strict backup versions
 2014-02-27 14:12:25 +00:00
Stefan Wolf 37e211822e fixed typo in user management help page 2014-02-27 15:02:57 +01:00
Dmitriy Zaporozhets ccd617e58e Default values for web hooks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 15:56:35 +02:00
Dmitriy Zaporozhets 0de7a7cfcd Add default value for Project#imported boolean 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 15:55:22 +02:00
Dmitriy Zaporozhets cac868ee94 Use new gitlab_git gem. It makes CONTRIBUTING.md work 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 15:52:14 +02:00
Jacob Vosmaer 75f274b750 Use Gitlab::VERSION to version backups 
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.
 2014-02-27 14:30:41 +01:00
Dmitriy Zaporozhets 0a963ee15a Merge branch 'pg_force_restore' into 'master' 
Pg Force Restore
 2014-02-27 12:27:30 +00:00
Dmitriy Zaporozhets b2cab1c52a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-27 13:14:03 +02:00
Dmitriy Zaporozhets 981deddfce Merge branch 'highlight_html_escape' into 'master' 
Enable html_escape for code blocks highlighted in markdown

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/94
 2014-02-27 11:13:46 +00:00
Dmitriy Zaporozhets c94dc3de78 html_escape is private for rails 4.0.2 :( 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 11:12:12 +02:00
Dmitriy Zaporozhets 4d896a2b86 Enable html_escape for code blocks highlighted in markdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 09:38:11 +02:00
tsl0922 5c3972ae1e remove dead code: broken_diffs 2014-02-27 14:58:27 +08:00
Dmitriy Zaporozhets b155a44ef4 Merge branch 'backup_restore_hooks_bug' into 'master' 
Fix backup/restore git hooks bug
 2014-02-26 20:54:23 +00:00
Dmitriy Zaporozhets 4713fc34cf Merge pull request #6416 from robbytaylor/patch-1 
Fixed typo in comments of apllication.scss
 2014-02-26 22:44:50 +02:00
Dmitriy Zaporozhets 8dd0076caf Merge pull request #6423 from robertd/update_changelog 
Updated changelog with my name for #6267
 2014-02-26 22:44:39 +02:00
Robert Djurasaj e27746f1ed Updated changelog with my name for #6267 2014-02-26 11:34:37 -07:00
Jacob Vosmaer 8fe10e642a Empty the database during Postgres backup restore 
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.
 2014-02-26 18:26:31 +01:00
Jacob Vosmaer 91c70c5b1c Use gitlab_shell.path to invoke rewrite-hooks.sh 
The backup restore code for repositories was assuming that gitlab-shell
is installed in /home/git/gitlab-shell. This commit changes that to use
the configuration setting from gitlab.yml that specifies the path where
gitlab-shell is installed.
 2014-02-26 17:32:52 +01:00
Dmitriy Zaporozhets fd3ab6955f More entries to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 18:24:05 +02:00
Dmitriy Zaporozhets a1e5d4e8b5 Merge pull request #6382 from jvanbaarsen/contribution-guide-link 
Contribution guide link
 2014-02-26 18:22:22 +02:00
Dmitriy Zaporozhets d36669d8ea Merge pull request #6420 from Seklfreak/add-piwik-support 
Added Piwik Integration
 2014-02-26 18:19:25 +02:00
Dmitriy Zaporozhets 63d0c0b93b Merge branch 'gitlab_popen_array' into 'master' 
Change Gitlab::Popen to only accept arrays as commands
 2014-02-26 15:38:56 +00:00
Dmitriy Zaporozhets 6c1af64566 Merge branch 'improve/edit_cancel' into 'master' 
Better redirect for edit blobs from MergeRequest
 2014-02-26 15:18:07 +00:00
Dmitriy Zaporozhets a9280de11f Better redirect for edit blod from MergeRequest 
If you cancel edit you will be redirected back to merge request
If you submit changes you will be redirected back to merge request

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 14:06:31 +02:00
Dmitriy Zaporozhets 5d6e4bd2d8 Fix gitlab ci widget for forks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 13:18:27 +02:00
Dmitriy Zaporozhets 6ef3505b19 Add default settings to test env. Removed wrong comment for rack_profiler 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 12:44:29 +02:00
Dmitriy Zaporozhets 1ff1b6d816 Merge pull request #5719 from jacob-carlborg/mr_target 
By default, target original repository if it's a fork when creating new MR.
 2014-02-26 12:33:48 +02:00