summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge pull request #9039 from gemnasium/update-gemnasium-gitlab-service-to-0-2-6Dmitriy Zaporozhets2015-04-151-1/+1
|\ \ | |/ |/|
| * Update gemnasium-gitlab-service to 0.2.6fabien2015-03-271-1/+1
* | Update redcarpet to 3.2.3Robert Speicher2015-04-091-2/+2
* | Update gitlab_git to 7.1.6 because 7.1.5 had broken language detection.emailsonpush-last-lineDouwe Maan2015-03-311-2/+2
* | Update gitlab_git to 7.1.5, to fix final line in EmailsOnPush email diff bein...Douwe Maan2015-03-311-2/+2
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-291-3/+3
|\ \
| * | update acts-as-taggable-onNihad Abbasov2015-03-291-3/+3
| |/
* | Merge branch 'fix-plain-diffs' into 'master'Dmitriy Zaporozhets2015-03-291-2/+2
|\ \ | |/ |/|
| * Upgrade gitlab_git gem to version 7.1.3Vinnie Okada2015-03-281-2/+2
* | Merge branch 'update-rugments' into 'master'Dmitriy Zaporozhets2015-03-241-1/+1
|\ \
| * | Update rugments to 1.0.0.beta6 to fix C# highlighting.update-rugmentsDouwe Maan2015-03-241-1/+1
* | | Revert "Update gemnasium-gitlab-service gem"Douwe Maan2015-03-231-1/+1
|/ /
* | Add sidetiq dependencyVinnie Okada2015-03-211-0/+6
|/
* gollum-lib updateValery Sizov2015-03-201-6/+6
* update doorkeeper to 2.1.3Valery Sizov2015-03-201-3/+3
* Merge branch 'revert-unicorn-timeout' into 'master'Dmitriy Zaporozhets2015-03-201-8/+0
|\
| * Revert "Increase timeout for Git-over-HTTP requests."Dmitriy Zaporozhets2015-03-191-8/+0
* | Revert "Update poltergeist to support phantomjs 2.0"Dmitriy Zaporozhets2015-03-191-5/+3
|/
* Merge branch 'version-bump-poltergeist' into 'master'Dmitriy Zaporozhets2015-03-191-3/+5
|\
View Lorry Controller Status