summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Add capybara-screenshot gemRobert Speicher2015-04-251-3/+2
* Update jquery-atwho-railsRobert Speicher2015-04-231-1/+1
* Update d3_railsRobert Speicher2015-04-231-1/+1
* Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets2015-04-221-1/+2
|\
| * Add jasmine-rails gemRobert Speicher2015-04-181-0/+1
| * Update jasmine gemRobert Speicher2015-04-181-2/+2
* | Update gitlab-grack to 2.0.2.Marin Jankovski2015-04-221-2/+2
* | Change html-pipeline-gitlab gem to html-pipelineRobert Speicher2015-04-211-1/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-211-1/+1
|\ \
| * | Update gitlab-grack to 2.0.1 to get unicorn to stop creating zombies.gitlab-grack-2.0.1Douwe Maan2015-04-201-1/+1
* | | Merge pull request #9058 from chulkilee/upgrade-hipchatJeroen van Baarsen2015-04-211-1/+1
|\ \ \ | |/ / |/| |
| * | upgrade hipchatChulki Lee2015-04-131-1/+1
* | | Ignore submodules that are defined in .gitmodules but are checked in as direc...gitlab_git-7.1.10Douwe Maan2015-04-171-1/+1
| |/ |/|
* | Update gitlab_git to ignore invalid lines in .gitmodules.gitlab_git-7.1.9Douwe Maan2015-04-171-1/+1
|/
* Merge branch 'reference-access-control' into 'master'Dmitriy Zaporozhets2015-04-131-1/+2
|\
| * Allow byebug to be used in test.Douwe Maan2015-04-031-1/+2
* | Update redcarpet to 3.2.3Robert Speicher2015-04-091-1/+1
* | Update gitlab_git to 7.1.6 because 7.1.5 had broken language detection.emailsonpush-last-lineDouwe Maan2015-03-311-1/+1
* | Update gitlab_git to 7.1.5, to fix final line in EmailsOnPush email diff bein...Douwe Maan2015-03-311-1/+1
|/
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-291-1/+1
|\
| * update acts-as-taggable-onNihad Abbasov2015-03-291-1/+1
* | Merge branch 'fix-plain-diffs' into 'master'Dmitriy Zaporozhets2015-03-291-1/+1
|\ \ | |/ |/|
| * Upgrade gitlab_git gem to version 7.1.3Vinnie Okada2015-03-281-1/+1
* | Add sidetiq dependencyVinnie Okada2015-03-211-0/+1
|/
* gollum-lib updateValery Sizov2015-03-201-1/+1
* update doorkeeper to 2.1.3Valery Sizov2015-03-201-1/+1
* Merge branch 'revert-unicorn-timeout' into 'master'Dmitriy Zaporozhets2015-03-201-3/+0
|\
| * Revert "Increase timeout for Git-over-HTTP requests."Dmitriy Zaporozhets2015-03-191-3/+0
* | Revert "Update poltergeist to support phantomjs 2.0"Dmitriy Zaporozhets2015-03-191-1/+1
|/
* Merge branch 'version-bump-poltergeist' into 'master'Dmitriy Zaporozhets2015-03-191-1/+1
|\
| * Update poltergeist to support phantomjs 2.0Zeger-Jan van de Weg2015-03-191-1/+1
* | Bump gitlab_git to 7.1.2Dmitriy Zaporozhets2015-03-181-1/+1
|/
* Update omniauth-ldap.Douwe Maan2015-03-171-1/+1
* Merge branch 'remove_rubyracer' into 'master'Marin Jankovski2015-03-161-1/+0
|\
| * Remove rubyracer gem.remove_rubyracerMarin Jankovski2015-03-131-1/+0
* | Prevent gitlab-shell character encoding issues by receiving its changes as ra...Douwe Maan2015-03-151-0/+3
|/
* Bump gitlab_git to 7.1.1Dmitriy Zaporozhets2015-03-131-1/+1
* Merge branch 'master' into new-emojiDmitriy Zaporozhets2015-03-111-1/+1
|\
| * Bump gitlab_git to v7.1.0. It should fix a lot of encoding issuesDmitriy Zaporozhets2015-03-111-1/+1
* | Update html-pipeline and emojiDmitriy Zaporozhets2015-03-111-2/+2
|/
* Bump gitlab_git to fix 500 with annotated tags w/o messageDmitriy Zaporozhets2015-03-051-1/+1
* Merge branch 'timeout' into 'master'Dmitriy Zaporozhets2015-03-051-0/+3
|\
| * Increase timeout for Git-over-HTTP requests.Douwe Maan2015-03-041-0/+3
* | Update spring to 1.3.3Dmitriy Zaporozhets2015-03-041-1/+1
* | Bump gitlab_git to rc15Dmitriy Zaporozhets2015-03-041-1/+1
|/
* Add brakeman gemDmitriy Zaporozhets2015-03-021-0/+1
* Merge branch 'extend_markdown_upload' into 'master'Dmitriy Zaporozhets2015-02-251-0/+1
|\
| * Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-251-2/+2
| |\
| * \ Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-241-5/+2
| |\ \
| * | | Refactor.Douwe Maan2015-02-171-0/+1