summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Revert "Increase timeout for Git-over-HTTP requests."Dmitriy Zaporozhets2015-03-191-3/+0
* Bump gitlab_git to 7.1.2Dmitriy Zaporozhets2015-03-181-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
* | | | Merge branch 'bitbucket-import'Dmitriy Zaporozhets2015-02-251-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add Bitbucket importer.Douwe Maan2015-02-241-0/+1
| | |/ | |/|
* | | Merge branch 'master' into update_grackDmitriy Zaporozhets2015-02-241-1/+1
|\ \ \
| * | | update gitlab-linguistValery Sizov2015-02-241-1/+1
| |/ /
* | | update gitlab-grack to 2.0.0.rc2Valery Sizov2015-02-241-1/+1
|/ /
* | Merge pull request #8783 from jvanbaarsen/spring-updateDmitriy Zaporozhets2015-02-231-2/+2
|\ \
| * | Updated springJeroen van Baarsen2015-02-121-2/+2
* | | Create Aside js class for handling all sidebars in UI for mobile devicesDmitriy Zaporozhets2015-02-211-3/+0
| |/ |/|
* | Started on the rspec upgradeJeroen van Baarsen2015-02-121-1/+1
|/
* Merge pull request #8580 from j0k3r/asanaDmitriy Zaporozhets2015-02-081-0/+3
|\
| * Add Asana serviceJeremy2015-02-021-0/+3
* | GitLab integration. ImporterValery Sizov2015-02-051-0/+1
* | Add rubocop and remove rails_best_practices gemDmitriy Zaporozhets2015-02-021-2/+1
|/
* Merge pull request #8687 from tsigo/rs-pry-railsDmitriy Zaporozhets2015-01-291-1/+1
|\
| * Use pry-rails gem instead of pryRobert Speicher2015-01-291-1/+1
* | Update shoulda-matchersRobert Speicher2015-01-291-1/+1
|/
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce...Dmitriy Zaporozhets2015-01-281-1/+1
|\
| * Update semantic-ui-sass to 1.8yglukhov2015-01-271-1/+1
* | Add a commit calendar to the user profileHannes Rosenögger2015-01-291-0/+3
|/
* Upgrade Sidekiq to 3.3Vinnie Okada2015-01-211-1/+1
* Replace highlight.js with rouge-fork rugmentsStefan Tatschner2015-01-151-0/+1
* Updated gollum-libsStefan Tatschner2015-01-151-1/+1
* doorkeeper updateValery Sizov2015-01-131-1/+1
* Merge branch 'github_importer'Dmitriy Zaporozhets2015-01-131-0/+2
|\
| * Github ImporterValery Sizov2015-01-101-0/+2
* | Fix git blame on file not respecting branch selectionDmitriy Zaporozhets2015-01-101-1/+1
* | Merge branch 'easy-dev-install' into 'master'Dmitriy Zaporozhets2015-01-111-1/+1
|\ \ | |/ |/|
| * Require the ruby racer only in production since installing it on dev machines...easy-dev-installSytse Sijbrandij2014-12-151-1/+1
* | Merge branch 'ruby-2.2.0' of https://github.com/chulkilee/gitlabhq into chulk...Dmitriy Zaporozhets2015-01-061-1/+1
|\ \
| * | Update gems for ruby 2.2.0Chulki Lee2014-12-291-1/+1
* | | fix deleted file display when using new gitlab_git gem, and add new gitlab_gi...Arif Ali2014-12-301-1/+1