Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-20Bump devise-two-factor to 2.0.0Robert Speicher
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43
2015-09-20Bump devise to 3.5.2Robert Speicher
2015-09-18Fix 500 when accessing private project when not logged inKamil Trzcinski
2015-09-17Merge branch 'update-mailroom' into 'master'Robert Speicher
See merge request !1306
2015-09-16Fix gemfile.lockDmitriy Zaporozhets
2015-09-16Fix Gemfile.lockDouwe Maan
2015-09-16Merge branch 'master' into update-mailroomDouwe Maan
2015-09-16Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski
ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-16Update mail_roomDouwe Maan
2015-09-16Fix models/ci/mail_service_spec.rbKamil Trzcinski
- Change Notify to Ci::Notify - Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables
2015-09-15Remove gitlab_ci_meta from gemsKamil Trzcinski
2015-09-15Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski
ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
2015-09-15bump fogbugz gemJared Szechy
2015-09-15Use fixed version of fogbugz gemJared Szechy
This allows us to properly handle authentication errors.
2015-09-14Update gitlab_emoji to 0.1.1Robert Schilling
2015-09-11Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10Bump rouge to 1.10.1Stan Hu
2015-09-10Bump rouge to 1.10 to remove warning noise and fix other syntax highlighting ↵Stan Hu
bugs Closes #2128 Closes #2433
2015-09-09Fix brakemanDmitriy Zaporozhets
2015-09-09Fix spinach exceptionDmitriy Zaporozhets
2015-09-09Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets
2015-09-09fix GemfileValery Sizov
2015-09-09FogBugz project importJared Szechy
2015-09-07Merge branch 'crowd' into 'master'Valery Sizov
Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228
2015-09-02Crowd integrationValery Sizov
2015-09-02Update mail_room to 0.4.2 for better error handlingDouwe Maan
2015-09-01Merge branch 'gitlab-git-http-server' into 'master'Dmitriy Zaporozhets
Replace grack with gitlab-git-http-server See merge request !1229
2015-09-01Merge branch 'master' into 'master'Valery Sizov
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-08-31Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-serverJacob Vosmaer
2015-08-31Replace grack with gitlab-git-http-serverJacob Vosmaer
2015-08-27Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded filesStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/9577
2015-08-27Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan
2015-08-26Update mail_roomDouwe Maan
2015-08-26Groundwork for merging CI into CEDouwe Maan
2015-08-25Update Racc to 1.4.12Yorick Peterse
This ensures GitLab can actually run Rubinius, previously it would segfault in Racc during the bootup phase.
2015-08-24Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty modeStan Hu
Closes #2271
2015-08-20Use canonical version of mail_room.Douwe Maan
2015-08-19Update mail_room.Douwe Maan
2015-08-19Changes and stuff.Douwe Maan
2015-08-19Update mail_roomDouwe Maan
2015-08-19Reply by email POCDouwe Maan
2015-08-18Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodulesStan Hu
Closes #2262
2015-08-15Bump omniauth-saml to 1.4.1Robert Speicher
Updates a vulnerable `ruby-saml` dependency. - https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448 - https://github.com/onelogin/ruby-saml/pull/247
2015-08-14Update Flowdock integration to support new Flowdock APIBoyan Tabakov
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-11Merge branch 'optimize-haml-textarea-rendering' into 'master'Dmitriy Zaporozhets
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-11update gitlab_gitValery Sizov
2015-08-11link to the local gitlab_gitValery Sizov
2015-08-10Bump Haml to 4.0.7 to speed up textarea renderingStan Hu
Closes #1987
2015-08-10Merge branch 'disable-autocrlf-for-binary-files' into 'master'Stan Hu
Fix corrupted binary files when using API files endpoint Closes #2219 See merge request !1123
2015-08-10Add dropzone upload progressNikita Verkhovin