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-03-16Merge branch 'remove_rubyracer' into 'master'Marin Jankovski
Remove rubyracer gem See merge request !1706
2015-03-15Prevent gitlab-shell character encoding issues by receiving its changes as ↵Douwe Maan
raw data.
2015-03-14Remove rubyracer gem.Marin Jankovski
2015-03-13Bump gitlab_git to 7.1.1Dmitriy Zaporozhets
Verify found object is actually a commit in Commit.find
2015-03-12Fix Gemfile.lockDmitriy Zaporozhets
2015-03-12Merge branch 'master' into new-emojiDmitriy Zaporozhets
Conflicts: Gemfile.lock
2015-03-12Update html-pipeline and emojiDmitriy Zaporozhets
2015-03-11Bump gitlab_git to v7.1.0. It should fix a lot of encoding issuesDmitriy Zaporozhets
2015-03-06Merge branch 'bump_gitlab_git' into 'master'Dmitriy Zaporozhets
Bump gitlab_git to fix 500 with annotated tags w/o message Should fix https://gitlab.com/gitlab-org/gitlab-ce/issues/1181 See merge request !1640
2015-03-05Bump gitlab_git to fix 500 with annotated tags w/o messageDmitriy Zaporozhets
2015-03-05Merge pull request #8915 from gemnasium/update-gemnasium-to-0-2-5Robert Schilling
Update gemnasium-gitlab-service gem
2015-03-05Update rugments, fixes #8900Stefan Tatschner
2015-03-05Merge branch 'timeout' into 'master'Dmitriy Zaporozhets
Increase timeout for Git-over-HTTP requests. Fixes #2081 and https://gitlab.com/gitlab-org/gitlab-ce/issues/232. Normal web requests are bound by the `Rack::Timeout` timeout of 60 seconds, while Grack Git-over-HTTP requests are only bound by Unicorn's timeout which is now set to 1 hour, which should be plenty. The omnibus package should be updated to no longer use `unicorn['worker_timeout']` for the Unicorn timeout, but to set the `Slowpoke.timeout`. See merge request !1619
2015-03-05Update spring to 1.3.3Dmitriy Zaporozhets
2015-03-05Increase timeout for Git-over-HTTP requests.Douwe Maan
2015-03-04Bump gitlab_git to rc15Dmitriy Zaporozhets
2015-03-04Update gemnasium-gitlab-service gemfabien
2015-03-03Add brakeman gemDmitriy Zaporozhets
2015-03-01Merge pull request #8858 from Razer6/update-version-sorterJeroen van Baarsen
Update version sorter to 2.0.0, fixes #8572
2015-02-26Merge branch 'extend_markdown_upload' into 'master'Dmitriy Zaporozhets
Generalizes image upload in drag and drop in markdown to all files From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger. - [x] Rebase on master when !1553 is merged in See merge request !1530
2015-02-25Merge branch 'bitbucket-import'Dmitriy Zaporozhets
Conflicts: app/views/import/gitorious/status.html.haml db/schema.rb
2015-02-25Bump gemnasium service gemPhilippe Lafoucrière
2015-02-25Merge branch 'master' into extend_markdown_uploadDouwe Maan
# Conflicts: # app/controllers/files_controller.rb
2015-02-25Update version sorter to 2.0.0, fixes #8572Robert Schilling
2015-02-24Merge branch 'master' into update_grackDmitriy Zaporozhets
Conflicts: Gemfile.lock
2015-02-24Revert "Update charlock_holmes to 0.7.3"Dmitriy Zaporozhets
This reverts commit c217860ae74381d75a4932fabb4417ac08b014b4.
2015-02-24update gitlab-linguistValery Sizov
2015-02-24Add Bitbucket importer.Douwe Maan
2015-02-24Merge branch 'master' into extend_markdown_uploadDouwe Maan
# Conflicts: # app/views/projects/issues/_form.html.haml # app/views/projects/merge_requests/_form.html.haml # app/views/projects/merge_requests/_new_submit.html.haml # app/views/projects/milestones/_form.html.haml # app/views/projects/notes/_form.html.haml # app/views/projects/wikis/_form.html.haml # config/routes.rb # spec/controllers/projects_controller_spec.rb
2015-02-24update gitlab-grack to 2.0.0.rc2Valery Sizov
2015-02-24Merge pull request #8783 from jvanbaarsen/spring-updateDmitriy Zaporozhets
Updated spring
2015-02-24Merge pull request #8798 from jirutka/update-charlock_holmesDmitriy Zaporozhets
Update charlock_holmes to 0.7.3
2015-02-22Merge branch 'master' into rails-4.1.9Vinnie Okada
Conflicts: app/views/dashboard/projects.html.haml
2015-02-22Create Aside js class for handling all sidebars in UI for mobile devicesDmitriy Zaporozhets
2015-02-20Merge branch 'extend_markdown_upload' into generic-uploadsDouwe Maan
# Conflicts: # app/controllers/files_controller.rb # app/controllers/projects/uploads_controller.rb # app/uploaders/attachment_uploader.rb
2015-02-20Merge branch 'master' into rails-4.1.9Vinnie Okada
Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml
2015-02-20Update bootstrap-sass gemDmitriy Zaporozhets
2015-02-18Refactor.Douwe Maan
2015-02-14Update charlock_holmes to 0.7.3Jakub Jirutka
Version 0.6.9.4 fails to install on Gentoo Linux.
2015-02-14Upgrade to Rails 4.1.9Vinnie Okada
Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
2015-02-12Started on the rspec upgradeJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-02-12Updated springJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-02-08Merge pull request #8580 from j0k3r/asanaDmitriy Zaporozhets
Add Asana service
2015-02-05GitLab integration. ImporterValery Sizov
2015-02-03Fixes #8478. Update timfel-krb5-auth to 0.8.3.Mike Limansky
2015-02-03Add rubocop and remove rails_best_practices gemDmitriy Zaporozhets
2015-02-02Add Asana serviceJeremy
Also add ability to render "service.help" in markdown
2015-01-30Merge pull request #8687 from tsigo/rs-pry-railsDmitriy Zaporozhets
Use pry-rails gem instead of pry
2015-01-29Update shoulda-matchersRobert Speicher
This outdated gem was the cause of those annoying MiniTest errors. Also updates one use of `ensure_inclusion_of` which was deprecated in favor of `validate_inclusion_of`.
2015-01-29Use pry-rails gem instead of pryRobert Speicher
pry-rails has pry as a dependency and this lets us have all that pry when we run `rails console` :heart: