summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
| * | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-261-2/+2
| |\ \ \ \
| * | | | | Groundwork for merging CI into CEDouwe Maan2015-08-251-79/+115
| | | | | |
* | | | | | Update mail_roomDouwe Maan2015-09-161-1/+1
| |_|_|_|/ |/| | | |
* | | | | bump fogbugz gemJared Szechy2015-09-151-1/+1
| |_|_|/ |/| | |
* | | | Use fixed version of fogbugz gemJared Szechy2015-09-151-1/+1
| |_|/ |/| | | | | | | | This allows us to properly handle authentication errors.
* | | FogBugz project importJared Szechy2015-09-081-0/+4
| | |
* | | Merge branch 'crowd' into 'master'Valery Sizov2015-09-071-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228
| * | | Crowd integrationValery Sizov2015-09-021-0/+1
| | | |
* | | | Update mail_room to 0.4.2 for better error handlingDouwe Maan2015-09-021-1/+1
|/ / /
* | | Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-serverJacob Vosmaer2015-08-311-1/+1
|\ \ \
| * | | Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded filesStan Hu2015-08-271-1/+1
| | |/ | |/| | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9577
* | | Replace grack with gitlab-git-http-serverJacob Vosmaer2015-08-311-5/+0
|/ /
* | Update mail_roomupdate-mail-roomDouwe Maan2015-08-261-1/+1
| |
* | Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty modeStan Hu2015-08-231-1/+1
|/ | | | Closes #2271
* Use canonical version of mail_room.Douwe Maan2015-08-201-1/+1
|
* Changes and stuff.Douwe Maan2015-08-181-0/+2
|
* Reply by email POCDouwe Maan2015-08-181-0/+2
|
* Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodulesStan Hu2015-08-171-1/+1
| | | | Closes #2262
* Bump omniauth-saml to 1.4.1rs-gem-securityRobert Speicher2015-08-141-1/+1
| | | | | | | Updates a vulnerable `ruby-saml` dependency. - https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448 - https://github.com/onelogin/ruby-saml/pull/247
* Update Flowdock integration to support new Flowdock APIBoyan Tabakov2015-08-141-1/+1
| | | | Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
* update gitlab_gitgrit_blameValery Sizov2015-08-111-1/+1
|
* link to the local gitlab_gitValery Sizov2015-08-111-1/+1
|
* Fix corrupted binary files when using API files endpointStan Hu2015-08-091-1/+1
| | | | | | Add CHANGELOG for gitlab_git 7.2.9 updates Closes #2219
* Replace Rugments with RougeStefan Tatschner2015-07-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have mainly created the rugments fork for the purpose of improving gitlab's highlighting. Nowadays IMO it works way better than the old highlight.js solution. But the development is stuck on my side because of a couple of personal reasons: * I have finished my studies; last months I was writing my master thesis. So there was a huge time problem. I am sorry for that. * I had to move to Munich due to getting a (paid) job. Searching a flat here is horrible... :) * Last but not least, maintaining the same code base in two seperate projects is a mess. I have decided to switch back to rouge due to several reasons: * In the beginning I was quite motivated, but since I start working on my new job next week, the best solution IMO is switching back to upstream rouge. * Rouge is continously improving: https://github.com/jneen/rouge/blob/master/CHANGELOG.md http://rouge.jneen.net/ * There should be absolutely no regressions with this change. Most likely this pull request will almost fix some minor bugs. * One less gem in gitlab is a good thing. since Gitlab is quite a huge bundle of gems. Reducing complexity should be a major milestone. Thanks a lot to @stanhu and @jneen for the review!
* Upgrade gitlab_git to version 7.2.6 to fix Error 500 when creating network ↵Stan Hu2015-07-281-1/+1
| | | | | | graphs Closes #745
* Only load byebug on MRIYorick Peterse2015-07-181-5/+5
| | | | | This Gem relies on MRI specific debugging APIs. This at least allows installation on Rubinius/JRuby.
* Bump coveralls version, remove explicit rest-client dependencyrs-update-coverallsRobert Speicher2015-07-091-9/+3
|
* Bump capybara to 2.4.0Robert Speicher2015-07-061-1/+1
|
* Bump select2-rails versionRobert Speicher2015-07-061-1/+1
|
* Merge branch 'rs-gem-security' into 'master'Dmitriy Zaporozhets2015-07-021-1/+11
|\ | | | | | | | | | | | | | | | | | | | | | | Gem updates for security issues - sprockets (rails dependency, but we need to specify a version to pull in fixes) - sass-rails (no security issues, but required an update to meet new sprockets version requirement) - rest-client (coveralls dependency) See merge request !915
| * Gem updates for security issuesRobert Speicher2015-06-301-1/+11
| | | | | | | | | | | | | | | | - sprockets (rails dependency, but we need to specify a version to pull in fixes) - sass-rails (no security issues, but required an update to meet new sprockets version requirement) - rest-client (coveralls dependency)
* | Merge branch 'k-devise' into 'master'Job van der Voort2015-07-011-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | added note about Devise Added note about the authentication gem used in GitLab Because of question in https://groups.google.com/forum/#!topic/gitlabhq/G2rToah19-Q See merge request !912
| * | fixed notekaren Carias2015-06-301-3/+1
| | |
| * | added note about Devisekaren Carias2015-06-301-0/+2
| | |
View Lorry Controller Status