summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/ |/|
| * Protect OmniAuth request phase against CSRF.Douwe Maan2015-04-241-4/+4
* | Fix Gemfile.lockDmitriy Zaporozhets2015-05-121-1/+1
* | Merge branch '2fa' into 'master'Dmitriy Zaporozhets2015-05-121-0/+17
|\ \
| * | Bump attr_encryptedDmitriy Zaporozhets2015-05-121-9/+3
| * | Use non-broken version of attr_encryptedDmitriy Zaporozhets2015-05-091-2/+9
| * | Add 2 factor authentication gemsDmitriy Zaporozhets2015-05-091-0/+16
* | | 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
* | | Remove 'jasmine' gemRobert Speicher2015-05-061-6/+0
* | | Add task_list gemRobert Speicher2015-05-061-0/+3
|/ /
* | Add a rake task to automatically restart foreman when changes occurjubianchi2015-04-271-5/+8
* | Merge pull request #9209 from Soullivaneuh/bootstrap-updateJeroen van Baarsen2015-04-271-3/+3
|\ \
| * | Bootstrap 3.3.4Sullivan SENECHAL2015-04-271-3/+3
| |/
* | Add capybara-screenshot gemRobert Speicher2015-04-251-1/+4
|/
* Update jquery-atwho-railsRobert Speicher2015-04-231-2/+2
* Update d3_railsRobert Speicher2015-04-231-2/+2
* Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets2015-04-221-5/+11
|\
| * Add jasmine-rails gemRobert Speicher2015-04-181-0/+6
| * Update jasmine gemRobert Speicher2015-04-181-5/+5
* | Update gitlab-grack to 2.0.2.Marin Jankovski2015-04-221-2/+2
* | Change html-pipeline-gitlab gem to html-pipelineRobert Speicher2015-04-211-7/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-211-2/+2
|\ \
| * | Update gitlab-grack to 2.0.1 to get unicorn to stop creating zombies.gitlab-grack-2.0.1Douwe Maan2015-04-201-2/+2
* | | Merge pull request #9058 from chulkilee/upgrade-hipchatJeroen van Baarsen2015-04-211-3/+5
|\ \ \ | |/ / |/| |
| * | upgrade hipchatChulki Lee2015-04-131-3/+5
* | | Ignore submodules that are defined in .gitmodules but are checked in as direc...gitlab_git-7.1.10Douwe Maan2015-04-171-2/+2
| |/ |/|
* | Update gitlab_git to ignore invalid lines in .gitmodules.gitlab_git-7.1.9Douwe Maan2015-04-171-2/+2