Dmitriy Zaporozhets
2ed06dc41d
Fix group_icon spec
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-03-06 14:04:01 +02:00
Dmitriy Zaporozhets
261f212b3b
Use rails helper image-url for reference images in css
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-03-06 11:05:00 +02:00
Dmitriy Zaporozhets
4c132ed48e
Merge branch 'gitlab_git_5-7' into 'master'
...
Update gitlab_git to 5.7
2014-03-05 19:20:09 +00:00
Dmitriy Zaporozhets
1445f4211e
Update gitlab_git to 5.7
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-03-05 17:37:00 +02:00
Nick Huanca and Dmitriy Zaporozhets
d02e129a54
added verify false on gitlab_ci integrations
...
For those of us running self-signed in gitlab-ci it generates 500s SSL_verify errors if you don't have this.
2014-03-05 13:23:44 +02:00
Dmitriy Zaporozhets
f1d8efb770
Merge branch 'shell_new_style' into 'master'
...
Use new style shell commands
2014-03-05 10:45:46 +00:00
Jacob Vosmaer
132c1b4c0a
Merge branch 'out-of-beta' into 'master'
...
Out Of Beta
2014-03-05 10:29:35 +00:00
dosire
5d34c877e3
Add ruby to package.
2014-03-05 11:23:24 +01:00
dosire
83d94d5c9a
The packages are production ready.
2014-03-05 09:01:21 +01:00
Dmitriy Zaporozhets
fbbd989770
Merge branch 'update/deploy.sh' into 'master'
...
change mysql to postgres in some of the docs and scripts
* update deploy.sh, install gem without mysql, now that we want to use postgres instead
* update update_patch.md to assume postgres before mysql
* update ruby.md, to assume postgres
2014-03-04 16:39:21 +00:00
Dmitriy Zaporozhets
10458bc478
Merge pull request #6463 from gussan/add_index_merge_request_diffs_on_merge_request_id
...
Add index_merge_request_diffs_on_merge_request_id
2014-03-04 11:31:03 +02:00
gussan
93bc67ab11
Add index_merge_request_diffs_on_merge_request_id
2014-03-04 10:38:09 +09:00
Arif Ali
28f40b7205
prioritise postgres in doc/update/patch_versions.md, assume postgres in doc/update/ruby.md
2014-03-04 00:40:30 +00:00
Arif Ali
affc37ad02
change deploy.sh without mysql, now that we are moving to postgres
2014-03-04 00:10:49 +00:00
Dmitriy Zaporozhets
d0e73eeca1
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-03-03 22:01:46 +02:00
Dmitriy Zaporozhets
775aa578e4
Merge pull request #6361 from jvanbaarsen/made-binstubs-executable
...
Added executable file permission to binstubs
2014-03-03 19:41:05 +02:00
Dmitriy Zaporozhets
6d71292830
Merge pull request #6453 from gitlabhq/link-to-dot-com
...
Link to consolidated website with https links. Fixes #6017
2014-03-03 19:38:30 +02:00
Dmitriy Zaporozhets
e6e0ad4e5e
Merge branch 'feature/reopen_mr' into 'master'
...
Feature: reopen closed merge request
2014-03-03 13:18:48 +00:00
dosire
2135da1466
Also make the blog https.
2014-03-03 09:28:28 +01:00
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
03920b96d0
Merge pull request #6456 from jasonblanchard/remove-issue-assignee
...
Added option to remove issue assignee on project issue page and issue ed...
2014-03-03 09:50:54 +02:00
Jacob Vosmaer
d6b0ac96f7
Invoke Kernel#system with separate arguments
2014-03-03 08:40:30 +01:00
Jacob Vosmaer
b30b9c9c46
Replace shell commands with FileUtils
2014-03-03 08:40:30 +01:00
Jacob Vosmaer
dd703b3e2a
Remove duplicate code
2014-03-03 08:40:29 +01:00
Jacob Vosmaer
2b816075dc
Replace backticks with Gitlab::Popen
2014-03-03 08:40:29 +01:00
Jason Blanchard
3ada1d7ec3
Added option to remove issue assignee on project issue page and issue edit page
2014-03-02 13:10:45 -05:00
dosire
c3d5503984
Link to consolidated website with https links. Fixes #6017
2014-03-02 18:03:37 +01:00
Dmitriy Zaporozhets
a9dcfd851f
Merge pull request #6308 from jvanbaarsen/help-to-markdown
...
Convert all help files to markdown files in doc directory
2014-03-01 15:02:07 +02:00
Dmitriy Zaporozhets
54e40241f6
Merge branch 'backup_uploads_symlink' into 'master'
...
Backup Uploads Symlink
2014-03-01 12:55:13 +00:00
Dmitriy Zaporozhets
b97536a578
Merge branch 'db_reaping_frequency' into 'master'
...
DB Reaping Frequency
2014-03-01 12:55:01 +00: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
Jeroen van Baarsen
c06f4cd42f
JSON Lint the web-hooks.md file
...
Thanks to @jojosch for the initial work on the web-hooks.html.haml file!
2014-02-28 19:31:14 +01:00
Jeroen van Baarsen
564c37d9b6
Moved all the help files to markdown files:
...
Files moved:
* Workflow
* help/ssh
* help/webhooks
* help/system_hooks
* help/public_access
* help/permissions
2014-02-28 19:30:13 +01: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