 Achilleas Pipinellis
|
e70fb9cf75
|
New images for the commit build status
|
2015-12-01 09:02:40 +02:00 |
|
|
Achilleas Pipinellis
|
32a3c3e068
|
Place images in their own dir
|
2015-12-01 09:00:34 +02:00 |
|
|
Achilleas Pipinellis
|
3b4806bad9
|
Add option to enable GitLab CI via .gitlab-ci.yml
|
2015-12-01 08:58:09 +02:00 |
|
|
Achilleas Pipinellis
|
1058652a92
|
Add section of enabling GitLab CI
|
2015-12-01 08:58:09 +02:00 |
|
|
Achilleas Pipinellis
|
2c30d11e80
|
Clean up intro
|
2015-12-01 08:58:09 +02:00 |
|
 Job van der VoortandAchilleas Pipinellis
|
5f6117c0aa
|
update ci docs with yml reason and better quickstart
|
2015-12-01 08:56:40 +02:00 |
|
 Valery Sizov
|
13c6096e42
|
Merge branch 'upload_hook' into 'master'
Fire update hook from GitLab
https://gitlab.com/gitlab-org/gitlab-ce/issues/3069
See merge request !1882
|
2015-11-30 17:22:00 +00:00 |
|
 Robert Speicher
|
ceeb93fa77
|
Update CHANGELOG
[ci skip]
|
2015-11-30 12:02:44 -05:00 |
|
|
Robert Speicher
|
244c9a00e0
|
Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal'
See merge request !1916
|
2015-11-30 12:00:13 -05:00 |
|
|
Valery Sizov
|
e0131c5d07
|
Merge branch 'rails_update_to_4_2' into 'master'
Rails update to 4.2.4
https://gitlab.com/gitlab-org/gitlab-ce/issues/2694
See merge request !1902
|
2015-11-30 16:49:09 +00:00 |
|
 Valery SizovandValery Sizov
|
ae18ba1632
|
Fire update hook from GitLab
|
2015-11-30 18:36:34 +02:00 |
|
|
Valery Sizov
|
f1504e1ad5
|
test fix
|
2015-11-30 18:03:07 +02:00 |
|
|
Valery Sizov
|
e92ceb7b57
|
fix specs
|
2015-11-30 16:12:31 +02:00 |
|
 Douwe Maan
|
a8e05cec00
|
Merge branch 'rs-build-ssh-path-prefix' into 'master'
Simplify `build_gitlab_shell_ssh_path_prefix`
See merge request !1928
|
2015-11-30 13:15:21 +00:00 |
|
 Dmitriy Zaporozhets
|
d73d2a5e58
|
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
|
2015-11-30 10:24:40 +01:00 |
|
|
Dmitriy Zaporozhets
|
f41634c7f6
|
Merge branch 'gmail_actions_links_on_set_of_emails' into 'master'
Show Gmail actions links only on expected set of emails
See merge request !1901
|
2015-11-30 09:23:56 +00:00 |
|
|
Dmitriy Zaporozhets
|
69e9c4143b
|
Merge branch 'expire-application-settings-startup' of https://gitlab.com/stanhu/gitlab-ce
|
2015-11-30 10:23:25 +01:00 |
|
|
Valery Sizov
|
461731f076
|
fix notification_service specs
|
2015-11-30 11:21:10 +02:00 |
|
|
Dmitriy Zaporozhets
|
c48518ac21
|
Merge branch 'fix-admin-page-personal-projects' into 'master'
Fix Error 500 when viewing user's personal projects from admin page
This is a regression introduced in 4d7f00f.
Closes #3680
Closes https://github.com/gitlabhq/gitlabhq/issues/9861
Closes gitlab-org/gitlab-ee#90
See merge request !1909
|
2015-11-30 09:18:59 +00:00 |
|
|
Dmitriy Zaporozhets
|
0a1b50ef3f
|
Merge branch 'rs-clone-panel' into 'master'
Add clipboard button for project clone panel
Closes #3585
Project:
Wiki:
See merge request !1896
|
2015-11-30 09:17:39 +00:00 |
|
|
Dmitriy Zaporozhets
|
2abe9598c1
|
Merge branch 'rs-update-jquery-turbolinks' into 'master'
Bump jquery-turbolinks to ~> 2.1.0
See #2857
See merge request !1922
|
2015-11-30 09:15:20 +00:00 |
|
|
Dmitriy Zaporozhets
|
b4d40c16c2
|
Merge branch 'phantomjs' into 'master'
Use new phantomjs source
Version 1.9 was removed from upstream [Debian repos](http://ftp.de.debian.org/debian/pool/main/p/phantomjs/) so I [used fpm](https://gitlab.com/axil/phantomjs-debian) to build our own Debian packages.
Fixes #3722
See merge request !1924
|
2015-11-30 09:12:53 +00:00 |
|
|
Robert Speicher
|
e1522ec855
|
Simplify build_gitlab_shell_ssh_path_prefix
|
2015-11-29 17:52:40 -05:00 |
|
|
Achilleas Pipinellis
|
bb6ce2bb10
|
Test using a 1.9.8 phantomjs version built with fpm
https://gitlab.com/axil/phantomjs-debian
|
2015-11-29 13:44:19 +02:00 |
|
|
Achilleas Pipinellis
|
7d6323a9d4
|
Update phantomjs to 2.0.0
* Version 1.9 was removed from upstream Debian repos
|
2015-11-29 11:51:02 +02:00 |
|
|
Achilleas Pipinellis
|
15291c8974
|
Merge branch 'remove-satellites-reference' into 'master'
Remove reverence to satellites
Remove reference in backup docs
See merge request !1923
|
2015-11-28 22:20:26 +00:00 |
|
 Robert Schilling
|
85ad2140fa
|
Remove reverence to satellites [ci skip]
|
2015-11-28 20:53:17 +01:00 |
|
 Sytse Sijbrandij
|
db1fe56a0e
|
Merge branch 'doc_public_access' into 'master'
Update public access documentation
See merge request !1837
|
2015-11-28 07:08:17 +00:00 |
|
|
Robert Speicher
|
344cb89718
|
Bump jquery-turbolinks to ~> 2.1.0
See #2857
|
2015-11-27 16:34:59 -05:00 |
|
|
Robert Speicher
|
3723182a88
|
Move project visibility level off of the clone panel
|
2015-11-27 16:15:06 -05:00 |
|
 Robert Speicher
|
3c2914b486
|
Merge branch 'nginx-workhorse-upload-limit' into 'master'
Nginx workhorse upload limit
See merge request !1919
|
2015-11-27 19:41:02 +00:00 |
|
|
Robert Speicher
|
f1710073b4
|
Fix alignment
[ci skip]
|
2015-11-27 14:39:55 -05:00 |
|
 Jacob Vosmaer
|
04049b6b17
|
Fix indentation in NGINX config
|
2015-11-27 13:57:53 +01:00 |
|
|
Jacob Vosmaer
|
295d378e9a
|
Repeat "client_max_body_size 0" everywhere
It turns out that if we do not the declaration from
"location /" wins.
|
2015-11-27 13:56:26 +01:00 |
|
|
Douwe Maan
|
8f4b6d51f0
|
Merge branch 'jcorcuera/gitlab-ce-issue_3428'
|
2015-11-27 12:53:10 +01:00 |
|
 Stan Hu
|
312e3b1e16
|
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq
|
2015-11-26 08:14:10 -08:00 |
|
|
Stan Hu
|
2f90e71fd3
|
Merge pull request #9670 from janten/gravatar-retina
Add support for HiDPI displays in gravatar service
|
2015-11-26 08:13:28 -08:00 |
|
|
Stan Hu
|
78c1ab40e2
|
Gracefully handle when Redis is not available
|
2015-11-26 07:55:21 -08:00 |
|
 Jose Corcuera
|
b9df1a6355
|
Strip attributes for Milestone and Issuable. #3428
|
2015-11-26 10:16:50 -05:00 |
|
|
Valery SizovandValery Sizov
|
7f214cee74
|
Migrate mailers to ActiveJob
|
2015-11-26 17:03:43 +02:00 |
|
|
Douwe Maan
|
68a4533818
|
Merge branch 'rs-markdown-preview' into 'master'
Decouple Markdown previews from DropzoneInput
See merge request !1908
|
2015-11-26 13:05:25 +00:00 |
|
|
Douwe Maan
|
c887045cd2
|
Merge branch 'dbalexandre/gitlab-ce-fix-raw-personal-snippet-access-workflow'
|
2015-11-26 14:03:51 +01:00 |
|
|
Valery Sizov
|
3e0fe27627
|
Merge remote-tracking branch 'origin/master' into rails_update_to_4_2
|
2015-11-26 12:30:28 +02:00 |
|
|
Valery Sizov
|
38489d8d7d
|
update test_after_commit gem to 0.4.2
|
2015-11-26 11:57:04 +02:00 |
|
|
Dmitriy Zaporozhets
|
1befbbf57d
|
Merge branch 'rs-remove-enumerize' into 'master'
Remove enumerize gem
Closes #2803
See merge request !1912
|
2015-11-26 09:03:04 +00:00 |
|
|
Dmitriy Zaporozhets
|
21003c0cb2
|
Merge branch 'rs-update-asana' into 'master'
Bump asana to ~> 0.4.0
Closes #2830
See merge request !1911
|
2015-11-26 09:01:52 +00:00 |
|
|
Dmitriy Zaporozhets
|
b501ce0438
|
Merge branch 'rs-update-doorkeeper' into 'master'
Bump doorkeeper to ~> 2.2.0
Closes #2746
See merge request !1910
|
2015-11-26 09:01:23 +00:00 |
|
|
Stan Hu
|
2497d3d550
|
Fix 404 in redirection after removing a project
Closes https://github.com/gitlabhq/gitlabhq/issues/9844
Closes #3559
|
2015-11-25 23:11:35 -08:00 |
|
|
Stan Hu
|
1a8d4ded19
|
Merge branch 'fix-dup-changelog-entry' into 'master'
Remove duplicate CHANGELOG entry shipped in 8.1.4
See merge request !1914
|
2015-11-26 01:07:47 +00:00 |
|
|
Stan Hu
|
7adfb30c34
|
Remove duplicate entry shipped in 8.1.4
|
2015-11-25 17:06:36 -08:00 |
|