summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Update redcarpet gem. Fixes gem memory leakupdate-redcarpetDmitriy Zaporozhets2015-10-151-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-151-0/+3
|\
| * Added rack-lineprof for developmentYorick Peterse2015-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to measure the time (roughly) spent on a per line basis. This can also be used to measure timings for views, for example by adding the following to a URL: ?lineprof=app/views/projects/notes/_note rack-lineprof is only enabled when: 1. The application runs in development mode 2. The used Ruby is MRI 3. The environment variable ENABLE_LINEPROF is set to a non-empty value
| * Added active_record_query_traceYorick Peterse2015-10-151-0/+1
| | | | | | | | | | | | | | This can be used to track down where queries originate from, regardless of whether they're caused by N+1 problems or not. This can be enabled by setting the environment variable ENABLE_QUERY_TRACE to a non-empty value (e.g. "true").
| * Added Bullet to the GemfileYorick Peterse2015-10-151-0/+1
| | | | | | | | | | | | This can be used to resolve N+1 query problems. Bullet is disabled by default and can be enabled by starting Rails with the environment variable ENABLE_BULLET set to a non empty value (e.g. "true").
* | Merge branch 'git-archive-golang' into 'master' Douwe Maan2015-10-151-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Let gitlab-git-http-server handle archive downloads This change relies on changes in gitlab_git and gitlab-git-http-server. fixes #2429 See merge request !1548
| * \ Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-151-24/+20
| |\ \
| * | | Update gitlab_git to 7.2.19Jacob Vosmaer2015-10-151-1/+1
| | | |
* | | | Merge branch 'rs-remove-guard' into 'master' Dmitriy Zaporozhets2015-10-151-16/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Remove guard-rspec and its supporting gems See merge request !1551
| * | | Remove guard-rspec and its supporting gemsrs-remove-guardRobert Speicher2015-10-081-16/+0
| | | |
* | | | Merge branch 'rs-update-uglifier' into 'master' Dmitriy Zaporozhets2015-10-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update uglifier to ~> 2.7.2 Fixes a security vulnerability: - https://github.com/lautis/uglifier/pull/86 - https://github.com/mishoo/UglifyJS2/issues/751 - https://zyan.scripts.mit.edu/blog/backdooring-js/ See merge request !1590
| * | | | Update uglifier to ~> 2.7.2rs-update-uglifierRobert Speicher2015-10-141-1/+1
| | |_|/ | |/| |
* | | | Make Reply by email easier to configureDouwe Maan2015-10-131-1/+1
|/ / /
* | | Enable arbitration in MailRoomDouwe Maan2015-10-111-1/+1
| | |
* | | Merge branch 'rs-remove-slim' into 'master' Dmitriy Zaporozhets2015-10-101-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove slim Closes #2897 See merge request !1537
| * | | Remove slimrs-remove-slimRobert Speicher2015-10-081-1/+0
| |/ /
* | | Merge branch 'rs-update-whenever' into 'master' Dmitriy Zaporozhets2015-10-101-3/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Remove whenever gem Closes #2879 See merge request !1538
| * | Just kidding, we're deleting whenever entirelyrs-update-wheneverRobert Speicher2015-10-081-3/+0
| | |
| * | Update whenever to ~> 0.9.4Robert Speicher2015-10-071-1/+1
| | |
* | | Merge branch 'rs-update-slack-notifier' into 'master' Dmitriy Zaporozhets2015-10-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update slack-notifier to ~> 1.2.0 Closes #2826 See merge request !1533
| * | | Update slack-notifier to ~> 1.2.0rs-update-slack-notifierRobert Speicher2015-10-071-1/+1
| |/ /
* | | Merge branch 'rs-update-tinder' into 'master' Dmitriy Zaporozhets2015-10-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update tinder to ~> 1.10.0 Closes #2823 See merge request !1534
| * | | Update tinder to ~> 1.10.0rs-update-tinderRobert Speicher2015-10-071-1/+1
| |/ /
* | | Merge branch 'rs-update-rack-cors' into 'master' Dmitriy Zaporozhets2015-10-081-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update rack-cors to ~> 0.4.0 Closes #2800 See merge request !1536
| * | | Update rack-cors to ~> 0.4.0Robert Speicher2015-10-071-3/+3
| |/ /
* | | Update haml-rails to ~> 0.9.0rs-update-haml-railsRobert Speicher2015-10-071-1/+1
|/ /
* | Merge branch 'rs-update-omniauth-gems' into 'master' Dmitriy Zaporozhets2015-10-071-13/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Update omniauth-* gem dependencies - twitter to `~> 1.2.0` - closes #2763 - kerberos to `~> 0.3.0` - closes #2792 - google-oauth2 to `~> 0.2.0` - shibboleth to `~> 1.2.0` - closes #2791 See merge request !1526
| * | Update omniauth-shibboleth to ~> 1.2.0rs-update-omniauth-gemsRobert Speicher2015-10-061-2/+2
| | |
| * | Loosen omniauth-google-oauth2 to ~> 0.2.0Robert Speicher2015-10-061-1/+1
| | |
| * | Update omniauth-kerberos to ~> 0.3.0Robert Speicher2015-10-061-1/+1
| | |
| * | Update omniauth-twitter to ~> 1.2.0Robert Speicher2015-10-061-12/+12
| |/
* | Add directory feature buttonStan Hu2015-10-071-1/+1
|/ | | | | | | | | | | | | | | | | | Change "+" icon under "Files" section to have three options: * Create file * Upload file * New directory Upload file is no longer accessible from the "Create file" page. Users can now select a target branch in upload file as well. Closes #2799: Fixes a bug where file modes were overwritten after a commit Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files can no longer be overwritten in the "Create file" section. Closes #2557
* Added benchmark-ips to the GemfileYorick Peterse2015-10-021-0/+2
| | | | | This allows me to use this Gem for benchmarking without having to add/remove it every time.
* Update gitlab_git to 7.2.17.Douwe Maan2015-10-011-1/+1
|
* Use after_commit_queue to schedule import job immediatelyStan Hu2015-09-251-0/+2
|
* Merge branch 'update-mailroom' into 'master' Robert Speicher2015-09-241-1/+1
|\ | | | | | | | | | | | | Update mailroom to 0.5.2 Fixes #2698 and #2711. See merge request !1424
| * Update mail_roomDouwe Maan2015-09-241-1/+1
| |
* | Add the newrelic-grape gemnewrelic-grapeJacob Vosmaer2015-09-241-0/+1
|/ | | | This allows us to see a breakdown of API requests in New Relic.
* Add links to first and/or last page with kaminariZeger-Jan van de Weg2015-09-231-1/+1
| | | | Also update Kaminari gem to the latest version
* Bump devise-two-factor to 2.0.0rs-bump-two-factorRobert Speicher2015-09-191-1/+1
| | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43
* Bump devise to 3.5.2Robert Speicher2015-09-191-1/+1
|
* Merge branch 'master' into update-mailroomDouwe Maan2015-09-161-81/+116
|\
| * Merge remote-tracking branch 'origin/master' into ↵ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gKamil Trzcinski2015-09-161-1/+1
| |\ | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * | Fix models/ci/mail_service_spec.rbKamil Trzcinski2015-09-151-1/+1
| | | | | | | | | | | | | | | - Change Notify to Ci::Notify - Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables
| * | Remove gitlab_ci_meta from gemsKamil Trzcinski2015-09-151-2/+0
| | |
| * | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-151-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
| * | | Fix brakemanDmitriy Zaporozhets2015-09-091-1/+1
| | | |
| * | | Fix spinach exceptionDmitriy Zaporozhets2015-09-091-0/+1
| | | |
| * | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-091-7/+7
| |\ \ \
| * | | | fix GemfileValery Sizov2015-09-091-1/+1
| | | | |
View Lorry Controller Status