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-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-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-26Update mail_roomDouwe Maan
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-19Changes and stuff.Douwe 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-11update gitlab_gitValery Sizov
2015-08-11link to the local gitlab_gitValery Sizov
2015-08-10Fix corrupted binary files when using API files endpointStan Hu
Add CHANGELOG for gitlab_git 7.2.9 updates Closes #2219
2015-07-29Replace Rugments with RougeStefan Tatschner
I have mainly created the rugments fork for the purpose of improving gitlab's highlighting. Nowadays IMO it works way better than the old highlight.js solution. But the development is stuck on my side because of a couple of personal reasons: * I have finished my studies; last months I was writing my master thesis. So there was a huge time problem. I am sorry for that. * I had to move to Munich due to getting a (paid) job. Searching a flat here is horrible... :) * Last but not least, maintaining the same code base in two seperate projects is a mess. I have decided to switch back to rouge due to several reasons: * In the beginning I was quite motivated, but since I start working on my new job next week, the best solution IMO is switching back to upstream rouge. * Rouge is continously improving: https://github.com/jneen/rouge/blob/master/CHANGELOG.md http://rouge.jneen.net/ * There should be absolutely no regressions with this change. Most likely this pull request will almost fix some minor bugs. * One less gem in gitlab is a good thing. since Gitlab is quite a huge bundle of gems. Reducing complexity should be a major milestone. Thanks a lot to @stanhu and @jneen for the review!
2015-07-28Upgrade gitlab_git to version 7.2.6 to fix Error 500 when creating network ↵Stan Hu
graphs Closes #745
2015-07-18Only load byebug on MRIYorick Peterse
This Gem relies on MRI specific debugging APIs. This at least allows installation on Rubinius/JRuby.
2015-07-10Bump coveralls version, remove explicit rest-client dependencyRobert Speicher
2015-07-07Bump capybara to 2.4.0Robert Speicher
2015-07-07Bump select2-rails versionRobert Speicher
2015-07-02Merge branch 'rs-gem-security' into 'master'Dmitriy Zaporozhets
Gem updates for security issues - sprockets (rails dependency, but we need to specify a version to pull in fixes) - sass-rails (no security issues, but required an update to meet new sprockets version requirement) - rest-client (coveralls dependency) See merge request !915
2015-07-01Merge branch 'k-devise' into 'master'Job van der Voort
added note about Devise Added note about the authentication gem used in GitLab Because of question in https://groups.google.com/forum/#!topic/gitlabhq/G2rToah19-Q See merge request !912
2015-07-01Gem updates for security issuesRobert Speicher
- sprockets (rails dependency, but we need to specify a version to pull in fixes) - sass-rails (no security issues, but required an update to meet new sprockets version requirement) - rest-client (coveralls dependency)
2015-07-01Bump Redcarpet to 3.3.2Robert Speicher
Closes #1911
2015-06-30fixed notekaren Carias
2015-06-30added note about Devisekaren Carias
2015-06-30Merge branch 'fix-c-prototype-highlighting' into 'master'Stan Hu
Bump rugments to 1.0.0beta8 to fix C prototype function highlighting Closes #1890 See merge request !902
2015-06-29Bump rugments to v1.0.0beta8 to fix C prototype function highlightingStan Hu
Closes #1890
2015-06-26Add Fuubar gemRobert Speicher
2015-06-22Bump database_cleaner to ~> 1.4.0Robert Speicher
2015-06-22Bump rspec to 3.3.0Robert Speicher
2015-06-22Update email_spec gemRobert Speicher
This fixes spec/mailers/notify_spec Also only require email_spec in the one place it's used
2015-06-22Bump poltergeist to 1.6.0Robert Speicher
2015-06-22Upgrade to newer version of CapybaraJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-06-22Started on the actual rspec 3 upgradeJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-06-22Bump gitlab_git to 7.2.5Jacob Vosmaer
2015-06-17Bump jquery-rails gem versionRobert Speicher
2015-06-17Bump rails to 4.1.11, and make the version requirement exactRobert Speicher
2015-06-14Update Redcarpet to 3.3.0Robert Speicher
Fixes #1432
2015-06-10Merge branch 'rs-pre-rspec-3' into 'master'Dmitriy Zaporozhets
Changes back-ported from rspec3 branch This is just breaking up the large `road-to-rspec-3` branch a bit. Each of these commits have been cherry-picked and would be good to have in place before the upgrade. See merge request !792
2015-06-10Merge branch 'master' into 'master'Dmitriy Zaporozhets
update fog to 1.25.0 and add multipart upload support This merge will fix backup uploading problems to s3, closing gitlab-org/gitlab-ce#1059 See merge request !789
2015-06-10Fix shoulda-matchers requireRobert Speicher
2015-06-10Bump shoulda-matchers and webmock gem versionsRobert Speicher
2015-06-10Update browser gem to version 0.8.0 for IE11 supportStan Hu
Closes #1775
2015-06-09update fog to 1.25.0 and add multipart upload supportJeroen Nijhof
2015-06-05Refactor web editorDmitriy Zaporozhets
* fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-04Remove GuardRobert Speicher
None of the GitLab B.V. developers were using it.