summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-gem-security' into 'master'Dmitriy Zaporozhets2015-07-021-21/+30
|\
| * Gem updates for security issuesRobert Speicher2015-06-301-21/+30
* | Bump Redcarpet to 3.3.2rs-issue-1911Robert Speicher2015-06-301-2/+2
|/
* Merge branch 'fix-c-prototype-highlighting' into 'master'Stan Hu2015-06-301-2/+2
|\
| * Bump rugments to v1.0.0beta8 to fix C prototype function highlightingStan Hu2015-06-281-2/+2
* | Add Fuubar gemRobert Speicher2015-06-251-1/+9
|/
* Updated the categories of Application Settings FormDarby2015-06-231-0/+3
* Bump pg gem to 0.18.2Robert Speicher2015-06-221-1/+1
* Bump database_cleaner to ~> 1.4.0Robert Speicher2015-06-221-5/+2
* Bump rspec to 3.3.0Robert Speicher2015-06-221-19/+23
* Update email_spec gemRobert Speicher2015-06-221-3/+3
* Bump poltergeist to 1.6.0Robert Speicher2015-06-221-3/+5
* Upgrade to newer version of CapybaraJeroen van Baarsen2015-06-221-2/+2
* Started on the actual rspec 3 upgradeJeroen van Baarsen2015-06-221-13/+14
* Bump gitlab_git to 7.2.5Jacob Vosmaer2015-06-221-2/+2
* Merge branch 'placeholder_text'Dmitriy Zaporozhets2015-06-171-3/+0
|\
| * Changed the placeholder text and modified the css class to make it visibleplaceholder_textDarby2015-06-161-0/+3
* | Bump jquery-rails gem versionrs-rails-updateRobert Speicher2015-06-161-2/+2
* | Bump rails to 4.1.11, and make the version requirement exactRobert Speicher2015-06-161-30/+33
|/
* Update Redcarpet to 3.3.0rs-issue-1432Robert Speicher2015-06-131-2/+2
* Merge branch 'rs-pre-rspec-3' into 'master'Dmitriy Zaporozhets2015-06-101-9/+9
|\
| * Bump shoulda-matchers and webmock gem versionsRobert Speicher2015-06-101-9/+9
* | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-06-101-15/+67
|\ \
| * | update fog to 1.25.0 and add multipart upload supportJeroen Nijhof2015-06-091-15/+67
| |/
* | Update browser gem to version 0.8.0 for IE11 supportStan Hu2015-06-091-2/+2
|/
* Refactor web editorrefactor-web-editorDmitriy Zaporozhets2015-06-051-2/+2
* Remove GuardRobert Speicher2015-06-031-23/+0
* Bump jquery-rails versionRobert Speicher2015-06-021-2/+2
* Remove now-unused `escaped_autolink` helper and rails_autolink gemRobert Speicher2015-06-021-3/+0
* Remove files in web editor using ruggedDmitriy Zaporozhets2015-06-021-2/+2
* Fix adding new file to empty repoDmitriy Zaporozhets2015-06-011-2/+2
* Create and edit files in web editor via ruggedDmitriy Zaporozhets2015-06-011-2/+2
* Merge branch 'feature/saml_support' into 'master'Douwe Maan2015-05-291-0/+12
|\
| * Add SAML support via OmniauthAlex Lossent2015-05-271-0/+12
* | Merge branch 'rs-teaspoon' into 'master'Dmitriy Zaporozhets2015-05-291-10/+11
|\ \
| * | Remove jasmine-rails; add teaspoonRobert Speicher2015-05-281-10/+11
* | | Bump turbolinks versionRobert Speicher2015-05-291-6/+6
|/ /
* | Fix git blame syntax highlighting when different commits break up linesStan Hu2015-05-271-2/+2
|/
* Merge branch 'rs-gems' into 'master'Dmitriy Zaporozhets2015-05-261-6/+6
|\
| * Update ffaker gemRobert Speicher2015-05-201-5/+5
| * Update spring, re-run binstubsRobert Speicher2015-05-201-1/+1
* | Remove Rack Attack monkey patches and bump to version 4.3.0Stan Hu2015-05-221-2/+2
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJob van der Voort2015-05-211-3/+3
|\ \ | |/
| * Subclass TaskList::Filter to fix a bugrs-issue-1645Robert Speicher2015-05-201-3/+3
* | Updated the gitlab_git gemJeroen van Baarsen2015-05-211-4/+4
|/
* Update asciidoctor gem to the latest versionJakub Jirutka2015-05-181-2/+2
* Fix gemfile.lockDmitriy Zaporozhets2015-05-151-1/+1
* Merge branch 'fix-blob-path' into 'master'Douwe Maan2015-05-141-1/+1
|\
| * Fix broken view when viewing history of a file that includes a path that used...Stan Hu2015-05-131-1/+1
* | Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets2015-05-141-4/+4
|\ \ | |/ |/|