dosire
67eb14d308
We have html targets for paragraphs now.
2014-03-17 14:36:20 +01:00
Dmitriy Zaporozhets
0aa389b491
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-03-10 17:34:09 +02:00
Dmitriy Zaporozhets
ea432f6032
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2014-03-10 17:33:57 +02:00
Dmitriy Zaporozhets
a7df646e05
Merge pull request #6480 from jvanbaarsen/add-envrc-to-ignore
...
Add envrc to git-ignore
2014-03-10 17:30:38 +02:00
Dmitriy Zaporozhets
dca8f6d4a6
Merge pull request #6492 from tsigo/gitlab-shell-custom-path
...
Respect custom gitlab_shell path in gitlab:gitlab_shell:check task
2014-03-10 17:30:21 +02:00
Dmitriy Zaporozhets
d33d550e3e
Merge pull request #6500 from tsigo/natural-tag-sorting
...
Natural version sorting
2014-03-10 17:27:23 +02:00
Dmitriy Zaporozhets
322a8f1d6d
Merge branch 'add-enterprise-linux' into 'master'
...
Add Enterprise Linux
2014-03-10 15:18:02 +00:00
Dmitriy Zaporozhets
5ae9de7403
Merge branch 'increase-nginx-push-size' into 'master'
...
Increase Nginx Push Size
2014-03-10 15:13:18 +00:00
Jacob Vosmaer
0142aa5a34
Merge pull request #6494 from tsigo/fix-redis-version-check
...
Fix now-invalid invocation of `run_and_match` in gitlab:check
2014-03-10 12:18:45 +01:00
dosire
b5264c24e8
Update changelog.
2014-03-10 09:15:30 +01:00
dosire
6bf5215b23
Some people are getting the error 'The remote end hung up unexpectedly' due to large chuncks.
2014-03-10 09:11:19 +01:00
Robert Speicher
efd860d1da
Remove extra whitespace
2014-03-10 03:44:49 -04:00
Sytse Sijbrandij
2ae6f17deb
Merge pull request #6498 from Nullreff/master
...
Fix grammar in zero_authorized_projects view
2014-03-10 08:01:26 +01:00
Robert Speicher
74d2085cdf
Sort tag names using VersionSorter
2014-03-09 00:01:06 -05:00
Robert Speicher
a37c679400
Remove arguments from grouped_options_refs
...
Must have been left over from a previous revision, but the argument
wasn't used anywhere in the method.
2014-03-09 00:01:06 -05:00
Robert Speicher
29db8efaa4
Add version_sorter gem
2014-03-09 00:01:06 -05:00
Ryan Mendivil
1c46a0d471
Fix grammar in zero_authorized_projects view
2014-03-08 10:33:28 -09:00
Robert Speicher
c5f76e5939
Popen (at least on OSX) expects an Array, not a String
...
This was causing the gitlab:check task to exit prematurely with the
error "System commands must be given as an array of strings."
2014-03-07 21:39:48 -05:00
Robert Speicher
30f8713aa1
Respect custom gitlab_shell path in gitlab:gitlab_shell:check task
...
Prior to this change, if I customized the config value of
`gitlab.gitlab_shell.path`, the check would ignore this value in favor
of `"~<gitlab.gitlab_shell.ssh_user>/gitlab-shell/"` resulting in a
failed check when the configuration was otherwise valid.
2014-03-07 21:05:56 -05:00
dosire
339fce559a
Add enterprise linux distributions as officially supported.
2014-03-07 16:35:59 +01:00
Sytse Sijbrandij
c3f088d261
Merge pull request #6489 from cirosantilli/typo-trihher
...
Correct typos in web_hooks help.
2014-03-07 09:54:55 +01:00
Ciro Santillli
8199ba05b8
Correct typos in web_hooks help.
2014-03-07 09:43:14 +01:00
Dmitriy Zaporozhets
c4d4481f4c
Merge branch 'fix-group-projects-sort' into 'master'
...
Sort projects by activity at group show page
2014-03-06 19:23:14 +00:00
Dmitriy Zaporozhets
8634d0d5c1
Sort projects by activity at group show page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-03-06 18:31:08 +02:00
Dmitriy Zaporozhets
9ff75e6a6f
Merge branch 'fix-discover-branch' into 'master'
...
Fix Discover Branch
Fixes #1073
2014-03-06 16:18:52 +00:00
Jeroen van Baarsen
9583631666
Add envrc to git-ignore
...
envrc files are created when you use direnv (Its recommended in
combination with spring, see: https://github.com/rails/spring#setup )
2014-03-06 15:55:57 +01:00
Dmitriy Zaporozhets
694388dfbc
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-03-06 15:50:18 +02:00
Dmitriy Zaporozhets
cf6a0ff760
Merge branch 'assets-css-helpers' into 'master'
...
Use rails helper image-url for reference images in css
Fixes #1001
2014-03-06 13:49:55 +00:00
Dmitriy Zaporozhets
0776199b4a
Update gitlab_git to version 5.7.1
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-03-06 15:48:56 +02:00
Sytse Sijbrandij
75f595ac92
Merge pull request #6447 from jvanbaarsen/patch-2
...
Added part about the help to markdown
2014-03-06 14:24:59 +01:00
Dmitriy Zaporozhets
2ed06dc41d
Fix group_icon spec
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-03-06 14:04:01 +02:00
Jeroen van Baarsen
60978e94bb
Added part about the help to markdown
2014-03-06 12:36:34 +01: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
0004aafe37
Merge pull request #6473 from veonik/fix-readme-title
...
Fixed readme title
2014-03-06 10:21:41 +02:00
Dmitriy Zaporozhets
c1d070cf55
Merge pull request #6475 from tsigo/merge-request-autocomplete
...
Add GFM autocompletion for MergeRequests
2014-03-06 10:20:55 +02:00
Robert Speicher
1688a29023
Add GFM autocompletion for MergeRequests
...
Requested
[here](http://feedback.gitlab.com/forums/176466-general/suggestions/5507440-auto-complete-merge-requests-in-gitlab-markdown ).
2014-03-05 23:24:03 -05:00
Tyler Sommer
e9942e5a79
Fixed readme page title
2014-03-05 11:23:21 -08: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