home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 04:36:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,132 Commits 48 Branches 340 Tags
docker-updates
Commit Graph
687 Commits
Author SHA1 Message Date
Robert Speicher 259851c0d6 Bump devise-two-factor to 2.0.0 
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605

See https://github.com/tinfoil/devise-two-factor/pull/43
 2015-09-19 21:16:18 -04:00
Robert Speicher ce8f78a571 Bump devise to 3.5.2 2015-09-19 21:12:32 -04:00
Kamil Trzcinski d4be967478 Fix 500 when accessing private project when not logged in 2015-09-17 23:27:08 +02:00
Robert Speicher 480e713c8f Merge branch 'update-mailroom' into 'master' 
See merge request !1306
 2015-09-16 22:19:35 -04:00
Dmitriy Zaporozhets 0696aeb3dc Fix gemfile.lock 2015-09-16 15:19:47 +02:00
Douwe Maan 4b95b0ebec Fix Gemfile.lock 2015-09-16 14:43:27 +02:00
Douwe Maan 624a2cf27c Merge branch 'master' into update-mailroom 2015-09-16 14:42:49 +02:00
Kamil Trzcinski ac8d2eb065 Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-16 13:34:58 +02:00
Douwe Maan 7bb22831a1 Update mail_room 2015-09-16 09:03:32 +02:00
Kamil Trzcinski 2d8c4273ef Fix models/ci/mail_service_spec.rb 
- Change Notify to Ci::Notify
- Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables
 2015-09-15 23:18:52 +02:00
Kamil Trzcinski ddde3e3ae8 Remove gitlab_ci_meta from gems 2015-09-15 22:42:30 +02:00
Kamil Trzcinski e21deaee8e Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
# Conflicts:
#	Gemfile.lock
 2015-09-15 22:40:35 +02:00
Jared Szechy c95b8476c7 bump fogbugz gem 2015-09-15 16:09:32 -04:00
Jared Szechy 93bb8f14ef Use fixed version of fogbugz gem 
This allows us to properly handle authentication errors.
 2015-09-15 15:23:30 -04:00
Robert Schilling 0d01008876 Update gitlab_emoji to 0.1.1 2015-09-14 18:10:23 +02:00
Dmitriy Zaporozhets e3c30bf2e8 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-11 16:32:11 +02:00
Stan Hu e20529cec4 Bump rouge to 1.10.1 2015-09-10 13:38:43 -07:00
Stan Hu 3223a2a5ae Bump rouge to 1.10 to remove warning noise and fix other syntax highlighting bugs 
Closes #2128

Closes #2433
 2015-09-10 11:51:48 -07:00
Dmitriy Zaporozhets d516b02eb4 Fix brakeman 2015-09-09 15:41:21 +02:00
Dmitriy Zaporozhets 870f553bf3 Fix spinach exception 2015-09-09 15:32:20 +02:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02:00
Valery Sizov 3d6fed54f0 fix Gemfile 2015-09-09 11:06:35 +03:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Valery Sizov 954dd7ce87 Merge branch 'crowd' into 'master' 
Crowd integration

https://dev.gitlab.org/gitlab/gitlabhq/issues/2217

See merge request !1228
 2015-09-07 11:20:03 +00:00
Valery Sizov 3700e5a960 Crowd integration 2015-09-02 12:42:01 +03:00
Douwe Maan d72b8f87ac Update mail_room to 0.4.2 for better error handling 2015-09-02 08:12:01 +01:00
Dmitriy Zaporozhets 2ef16e7660 Merge branch 'gitlab-git-http-server' into 'master' 
Replace grack with gitlab-git-http-server

See merge request !1229
 2015-09-01 14:21:45 +00:00
Valery Sizov 96b55a0e90 Merge branch 'master' into 'master' 
Update Racc to 1.4.12

The primary reason for this is that this would let me debug #2343 using Rubinius' `-Xic.debug` option.

See merge request !1201
 2015-09-01 10:38:46 +00:00
Jacob Vosmaer 90b1ecfa01 Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-server 2015-08-31 15:51:41 +02:00
Jacob Vosmaer 4027a26e7b Replace grack with gitlab-git-http-server 2015-08-31 15:30:15 +02:00
Stan Hu ef6c06c0f3 Upgrade gitlab_git to 7.2.15 to fix git blame errors with ISO-encoded files 
Closes https://github.com/gitlabhq/gitlabhq/issues/9577
 2015-08-27 13:08:15 -07:00
Douwe Maan 843694f902 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-08-26 17:53:31 -07:00
Douwe Maan bc683a5904 Update mail_room 2015-08-26 08:58:46 -07:00
Douwe Maan 046b283127 Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
Yorick Peterse 1eba96c636 Update Racc to 1.4.12 
This ensures GitLab can actually run Rubinius, previously it would
segfault in Racc during the bootup phase.
 2015-08-25 20:29:03 +02:00
Stan Hu 6318a76311 Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode 
Closes #2271
 2015-08-23 16:52:29 -07:00
Douwe Maan 3ff9d5c64c Use canonical version of mail_room. 2015-08-20 10:58:04 -07:00
Douwe Maan 170aa3b43b Update mail_room. 2015-08-19 10:18:20 -07:00
Douwe Maan 8906cabae7 Changes and stuff. 2015-08-18 17:02:26 -07:00
Douwe Maan a428838dc0 Update mail_room 2015-08-18 15:50:46 -07:00
Douwe Maan f76eac56b9 Reply by email POC 2015-08-18 15:46:36 -07:00
Stan Hu 47d55306d9 Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules 
Closes #2262
 2015-08-17 23:56:02 +00:00
Robert Speicher adfcd57296 Bump omniauth-saml to 1.4.1 
Updates a vulnerable `ruby-saml` dependency.

- https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448
- https://github.com/onelogin/ruby-saml/pull/247
 2015-08-14 22:24:21 -04:00
Boyan Tabakov 88ab815b38 Update Flowdock integration to support new Flowdock API 
Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
 2015-08-14 16:45:23 +02:00
Dmitriy Zaporozhets 630a9421ed Merge branch 'optimize-haml-textarea-rendering' into 'master' 
Bump Haml to 4.0.7 to speed up textarea rendering

The current regexp caused long load times when textarea blocks were surrounded by whitespace. This fix has been submitted to the Haml library and passes tests there:

https://github.com/haml/haml/pull/850

Closes #1987

See merge request !984
 2015-08-11 17:10:45 +00:00
Valery Sizov cf6e58b589 update gitlab_git 2015-08-11 15:11:58 +03:00
Valery Sizov d9402504ad link to the local gitlab_git 2015-08-11 09:16:11 +03:00
Stan Hu e051a558ce Bump Haml to 4.0.7 to speed up textarea rendering 
Closes #1987
 2015-08-10 08:02:23 -07:00
Stan Hu 39bda5d05e Merge branch 'disable-autocrlf-for-binary-files' into 'master' 
Fix corrupted binary files when using API files endpoint

Closes #2219

See merge request !1123
 2015-08-10 14:04:07 +00:00
Nikita Verkhovin 17bab5022f Add dropzone upload progress 2015-08-10 13:18:02 +06:00