summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* Bump gitlab_git to 7.1.1Dmitriy Zaporozhets2015-03-131-2/+2
* Fix Gemfile.lockDmitriy Zaporozhets2015-03-111-5/+0
* Merge branch 'master' into new-emojiDmitriy Zaporozhets2015-03-111-2/+7
|\
| * Bump gitlab_git to v7.1.0. It should fix a lot of encoding issuesDmitriy Zaporozhets2015-03-111-3/+3
* | Update html-pipeline and emojiDmitriy Zaporozhets2015-03-111-8/+9
|/
* Merge branch 'bump_gitlab_git' into 'master'Dmitriy Zaporozhets2015-03-051-2/+2
|\
| * Bump gitlab_git to fix 500 with annotated tags w/o messageDmitriy Zaporozhets2015-03-051-2/+2
* | Merge pull request #8915 from gemnasium/update-gemnasium-to-0-2-5Robert Schilling2015-03-051-1/+1
|\ \ | |/ |/|
| * Update gemnasium-gitlab-service gemfabien2015-03-041-1/+1
* | Update rugments, fixes #8900Stefan Tatschner2015-03-051-1/+1
* | Merge branch 'timeout' into 'master'Dmitriy Zaporozhets2015-03-051-0/+8
|\ \
| * | Increase timeout for Git-over-HTTP requests.Douwe Maan2015-03-041-0/+8
| |/
* | Update spring to 1.3.3Dmitriy Zaporozhets2015-03-041-2/+2
* | Bump gitlab_git to rc15Dmitriy Zaporozhets2015-03-041-2/+2
|/
* Add brakeman gemDmitriy Zaporozhets2015-03-021-0/+20
* Merge pull request #8858 from Razer6/update-version-sorterJeroen van Baarsen2015-02-281-1/+1
|\
| * Update version sorter to 2.0.0, fixes #8572Robert Schilling2015-02-241-1/+1
* | Merge branch 'extend_markdown_upload' into 'master'Dmitriy Zaporozhets2015-02-251-0/+6
|\ \
| * \ Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-251-5/+5
| |\ \ | | |/
| * | Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-241-45/+37
| |\ \
| * \ \ Merge branch 'extend_markdown_upload' into generic-uploadsDouwe Maan2015-02-201-0/+6
| |\ \ \
| | * | | Refactor.Douwe Maan2015-02-171-0/+6
* | | | | Merge branch 'bitbucket-import'Dmitriy Zaporozhets2015-02-251-0/+5
|\ \ \ \ \
| * | | | | Add Bitbucket importer.Douwe Maan2015-02-241-0/+5
| | |_|/ / | |/| | |
* | | | | Bump gemnasium service gemPhilippe Lafoucrière2015-02-251-3/+3
| |_|_|/ |/| | |
* | | | Merge branch 'master' into update_grackDmitriy Zaporozhets2015-02-241-3/+3
|\ \ \ \
| * | | | Revert "Update charlock_holmes to 0.7.3"Dmitriy Zaporozhets2015-02-241-1/+1
| * | | | update gitlab-linguistValery Sizov2015-02-241-2/+2
| |/ / /
* | | | update gitlab-grack to 2.0.0.rc2Valery Sizov2015-02-241-2/+2
|/ / /
* | | Merge pull request #8783 from jvanbaarsen/spring-updateDmitriy Zaporozhets2015-02-231-4/+4
|\ \ \
| * | | Updated springJeroen van Baarsen2015-02-121-4/+4
* | | | Merge pull request #8798 from jirutka/update-charlock_holmesDmitriy Zaporozhets2015-02-231-1/+1
|\ \ \ \
| * | | | Update charlock_holmes to 0.7.3Jakub Jirutka2015-02-141-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-221-3/+0
|\ \ \ \
| * | | | Create Aside js class for handling all sidebars in UI for mobile devicesDmitriy Zaporozhets2015-02-211-3/+0
| | |_|/ | |/| |
* | | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-191-2/+6
|\ \ \ \ | |/ / /
| * | | Update bootstrap-sass gemDmitriy Zaporozhets2015-02-191-2/+6
| |/ /
* | | Upgrade to Rails 4.1.9Vinnie Okada2015-02-141-37/+32
|/ /
* | Started on the rspec upgradeJeroen van Baarsen2015-02-121-12/+16
|/
* Merge pull request #8580 from j0k3r/asanaDmitriy Zaporozhets2015-02-081-0/+9
|\
| * Add Asana serviceJeremy2015-02-021-0/+9
* | GitLab integration. ImporterValery Sizov2015-02-051-0/+4
* | Fixes #8478. Update timfel-krb5-auth to 0.8.3.Mike Limansky2015-02-031-1/+1
* | Add rubocop and remove rails_best_practices gemDmitriy Zaporozhets2015-02-021-16/+16
|/
* Merge pull request #8687 from tsigo/rs-pry-railsDmitriy Zaporozhets2015-01-291-1/+3
|\
| * Use pry-rails gem instead of pryRobert Speicher2015-01-291-1/+3
* | Update shoulda-matchersRobert Speicher2015-01-291-4/+4
|/
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce...Dmitriy Zaporozhets2015-01-281-2/+2
|\
| * Update semantic-ui-sass to 1.8yglukhov2015-01-271-2/+2
* | Add a commit calendar to the user profileHannes Rosenögger2015-01-291-0/+2
|/