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
path: root/Gemfile.lock
AgeCommit message (Collapse)Author
2015-08-10Fix corrupted binary files when using API files endpointStan Hu
Add CHANGELOG for gitlab_git 7.2.9 updates Closes #2219
2015-08-04Merge branch 'master' into drop-satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-31Bump redis-store to 1.1.6 and remove redid-store-fix-expiryKamil Trzcinski
2015-07-29Manually update rouge to 1.9.1Stefan Tatschner
Since gollum-lib blocks rouge from updating, let's bump the version manually. The fix has already been accepted upstream: https://github.com/gollum/gollum-lib/commit/9c042ea0914a7714abbda9d89e234c8a79fba893
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-16Huge refactoring for accepting merge requestsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-15Remove satellitesDmitriy Zaporozhets
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-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-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-24Updated the categories of Application Settings FormDarby
2015-06-22Bump pg gem to 0.18.2Robert 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-17Merge branch 'placeholder_text'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: Gemfile.lock
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-17Changed the placeholder text and modified the css class to make it visibleDarby
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-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.
2015-06-03Bump jquery-rails versionRobert Speicher
2015-06-02Remove now-unused `escaped_autolink` helper and rails_autolink gemRobert Speicher
2015-06-02Remove files in web editor using ruggedDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-01Fix adding new file to empty repoDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-01Create and edit files in web editor via ruggedDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29Merge branch 'feature/saml_support' into 'master'Douwe Maan
Add SAML support via Omniauth Split of !669, with doc See merge request !722
2015-05-29Merge branch 'rs-teaspoon' into 'master'Dmitriy Zaporozhets
Add Teaspoon for Javascript testing Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect. See https://github.com/modeset/teaspoon See merge request !715
2015-05-29Bump turbolinks versionRobert Speicher
2015-05-29Remove jasmine-rails; add teaspoonRobert Speicher
2015-05-28Fix git blame syntax highlighting when different commits break up linesStan Hu
Closes #1521
2015-05-27Add SAML support via OmniauthAlex Lossent
2015-05-26Merge branch 'rs-gems' into 'master'Dmitriy Zaporozhets
Update ffaker gem Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`. Prior, if a new developer checked out the repo, ran `bundle install` and then tried `rake dev:setup`, seeding would fail due to having the latest version of ffaker without the API changes in this MR. Also updates `spring` version and the binstubs, just for kicks. See merge request !686
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-10 16:32:08 +0300