summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Bump database_cleaner to ~> 1.4.0Robert Speicher2015-06-221-1/+1
* Bump rspec to 3.3.0Robert Speicher2015-06-221-11/+10
* Update email_spec gemRobert Speicher2015-06-221-1/+1
* Bump poltergeist to 1.6.0Robert Speicher2015-06-221-1/+1
* Upgrade to newer version of CapybaraJeroen van Baarsen2015-06-221-1/+1
* Started on the actual rspec 3 upgradeJeroen van Baarsen2015-06-221-2/+2
* Bump gitlab_git to 7.2.5Jacob Vosmaer2015-06-221-1/+1
* Bump jquery-rails gem versionrs-rails-updateRobert Speicher2015-06-161-1/+1
* Bump rails to 4.1.11, and make the version requirement exactRobert Speicher2015-06-161-1/+1
* Update Redcarpet to 3.3.0rs-issue-1432Robert Speicher2015-06-131-1/+1
* Merge branch 'rs-pre-rspec-3' into 'master'Dmitriy Zaporozhets2015-06-101-3/+3
|\
| * Fix shoulda-matchers requireRobert Speicher2015-06-101-1/+1
| * Bump shoulda-matchers and webmock gem versionsRobert Speicher2015-06-101-3/+3
* | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-06-101-1/+1
|\ \
| * | update fog to 1.25.0 and add multipart upload supportJeroen Nijhof2015-06-091-1/+1
| |/
* | Update browser gem to version 0.8.0 for IE11 supportStan Hu2015-06-091-1/+1
|/
* Refactor web editorrefactor-web-editorDmitriy Zaporozhets2015-06-051-1/+1
* Remove GuardRobert Speicher2015-06-031-17/+0
* Bump jquery-rails versionRobert Speicher2015-06-021-11/+11
* 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-1/+1
* Fix adding new file to empty repoDmitriy Zaporozhets2015-06-011-1/+1
* Create and edit files in web editor via ruggedDmitriy Zaporozhets2015-06-011-1/+1
* Add comments about gitlab forksDmitriy Zaporozhets2015-06-011-1/+5
* Exmplain gitlab-linguist fork existenceDmitriy Zaporozhets2015-06-011-0/+4
* Merge branch 'feature/saml_support' into 'master'Douwe Maan2015-05-291-0/+1
|\
| * Add SAML support via OmniauthAlex Lossent2015-05-271-0/+1
* | Merge branch 'rs-teaspoon' into 'master'Dmitriy Zaporozhets2015-05-291-4/+6
|\ \
| * | Remove jasmine-rails; add teaspoonRobert Speicher2015-05-281-4/+6
* | | Bump turbolinks versionRobert Speicher2015-05-291-1/+1
|/ /
* | Fix git blame syntax highlighting when different commits break up linesStan Hu2015-05-271-1/+1
|/
* Merge branch 'rs-gems' into 'master'Dmitriy Zaporozhets2015-05-261-1/+1
|\
| * Update ffaker gemRobert Speicher2015-05-201-1/+1
* | Remove Rack Attack monkey patches and bump to version 4.3.0Stan Hu2015-05-221-1/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJob van der Voort2015-05-211-1/+1
|\ \ | |/
| * Subclass TaskList::Filter to fix a bugrs-issue-1645Robert Speicher2015-05-201-1/+1
* | Updated the gitlab_git gemJeroen van Baarsen2015-05-211-1/+1
|/
* Update asciidoctor gem to the latest versionJakub Jirutka2015-05-181-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-1/+1
|\ \ | |/ |/|
| * Protect OmniAuth request phase against CSRF.Douwe Maan2015-04-241-1/+1
* | Merge branch '2fa' into 'master'Dmitriy Zaporozhets2015-05-121-0/+5
|\ \
| * | Bump attr_encryptedDmitriy Zaporozhets2015-05-121-1/+1
| * | Use non-broken version of attr_encryptedDmitriy Zaporozhets2015-05-091-0/+1
| * | Add 2 factor authentication gemsDmitriy Zaporozhets2015-05-091-0/+4
* | | Merge branch 'fix-tags-view-with-submodules' into 'master'Douwe Maan2015-05-121-1/+1
|\ \ \
| * | | Bump gitlab_git to 7.1.11 to fix bug where viewing a tag on a project with su...Stan Hu2015-05-041-1/+1
* | | | Make omniauth-kerberos dependency optional (add group 'kerberos')Jakub Jirutka2015-05-111-1/+1
| |/ / |/| |
* | | Remove 'jasmine' gemRobert Speicher2015-05-061-1/+0
View Lorry Controller Status