summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'update-gemoji' into 'master' Robert Speicher2016-07-051-1/+1
|\
| * Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.update-gemojiConnor Shea2016-06-291-1/+1
* | Merge branch 'upgrade-doorkeeper' into 'master' Robert Speicher2016-07-051-1/+1
|\ \
| * | Upgrade Doorkeeper from 3.1.0 to 4.0.0.upgrade-doorkeeperConnor Shea2016-07-011-1/+1
* | | Merge branch 'upgrade-rspec-rails' into 'master' Robert Speicher2016-07-041-1/+1
|\ \ \
| * | | Upgrade rspec-rails from 3.4.2 to 3.5.0.upgrade-rspec-railsConnor Shea2016-07-011-1/+1
* | | | Update RedCloth to 4.3.2 for CVE-2012-6684Takuya Noguchi2016-07-031-1/+1
| |/ / |/| |
* | | Merge branch 'upgrade-thin' into 'master' Robert Speicher2016-07-011-1/+1
|\ \ \ | |/ / |/| |
| * | Upgrade Thin from 1.6.1 to 1.7.0.Connor Shea2016-07-011-1/+1
* | | Remove quiet_assets in favor of built-in sprockets-rails config.upgrade-sprockets-railsConnor Shea2016-06-301-1/+0
|/ /
* | Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets2016-06-301-0/+1
|\ \
| * | Loop all disks when displaying system infoissue-18886Josh Frye2016-06-291-0/+1
* | | Remove coveralls as its unusedremove-converalls-gemZ.J. van de Weg2016-06-301-1/+0
| |/ |/|
* | Add fog-rackspace microgem to support backups using rackspace provider.jbub2016-06-291-0/+1
|/
* Use number_to_human_size for system info and remove dependency on Filesize gem.Josh Frye2016-06-281-1/+0
* Show basic system info on admin panel. Closes #18886Josh Frye2016-06-281-0/+4
* Update omniauth-saml to 1.6.0 to address a security vulnerability in ruby-samlPatricio Cano2016-06-271-1/+1
* Upgrade sentry-raven from 0.15.6 to 1.1.0.Connor Shea2016-06-241-1/+1
* Restrict hamlit version, remove coffeescript filters.Connor Shea2016-06-231-2/+1
* Replace Haml with Hamlit.connorshea2016-06-221-1/+2
* Merge branch 'update-mail_room-to-0.8.0' into 'master' 18848-pagination-overflows-on-mobileDouwe Maan2016-06-211-1/+1
|\
| * Update mail_room to 0.8.0 to resolve #13357update-mail_room-to-0.8.0Lin Jen-Shin2016-06-211-1/+1
* | Update browser gem to 2.2.0Stan Hu2016-06-201-1/+1
|/
* Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-171-1/+1
|\
| * fixed merge conflicts on UI branchJames Lopez2016-06-161-2/+4
| |\
| * \ Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-131-21/+31
| |\ \
| * \ \ Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-091-2/+3
| |\ \ \
| * \ \ \ Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-031-4/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-04-251-1/+1
| |\ \ \ \ \
| * | | | | | gitlab import UI - icon, file selector, etc... Also updated font-awesome and ...James Lopez2016-04-221-1/+1
* | | | | | | Use gitlab-git 10.2.0bump-gitlab-git-10.2.0Stan Hu2016-06-161-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'network-assets' into 'master' Jacob Schatz2016-06-151-1/+0
|\ \ \ \ \ \
| * | | | | | Replace raphael-rails with raphael.js so it can be split from the rest of the...Connor Shea2016-06-101-1/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-141-1/+1
|\ \ \ \ \ \
| * | | | | | Update brakeman from 3.2.1 to 3.3.2Connor Shea2016-06-121-1/+1
| |/ / / / /
* | | | | | Allow to expire build artifactsKamil Trzcinski2016-06-131-0/+3
|/ / / / /
* | | | | Merge branch 'support-fog-azure' into 'master' Rémy Coutable2016-06-081-0/+1
|\ \ \ \ \
| * | | | | Add Azure to supported backup list (left out accidentally)Stan Hu2016-06-071-0/+1
* | | | | | Bump recaptcha gem to 3.0.0 to remove deprecated stoken supportStan Hu2016-06-071-1/+1
|/ / / / /
* | | | | Load knapsack in Rakefile only when is bundledload-knapsack-if-definedKamil Trzcinski2016-06-071-1/+1
* | | | | Merge remote-tracking branch 'origin/master' into knapsackKamil Trzcinski2016-06-071-3/+6
|\ \ \ \ \
| * \ \ \ \ Merge branch 'license-finder-gem' into 'master' Rémy Coutable2016-06-071-0/+2
| |\ \ \ \ \
| | * | | | | Add License Finder gem.Connor Shea2016-06-061-0/+2
| * | | | | | Bump rouge to 1.11.0Stan Hu2016-06-061-1/+1
| |/ / / / /
| * | | | | Update the `browser` gem.Timothy Andrew2016-06-061-1/+1
| * | | | | Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-061-0/+1
| * | | | | Replace colorize gem with rainbow.Connor Shea2016-06-031-1/+1
* | | | | | Use knapsack 1.11.0Kamil Trzcinski2016-06-031-1/+1
* | | | | | Use own version of knapsack which supports spinach testsKamil Trzcinski2016-06-031-1/+1
* | | | | | Try to use knapsackKamil Trzcinski2016-06-031-0/+1
|/ / / / /
View Lorry Controller Status