summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Use after_commit_queue to schedule import job immediatelyStan Hu2015-09-251-0/+3
|
* Merge branch 'update-mailroom' into 'master' Robert Speicher2015-09-241-2/+2
|\ | | | | | | | | | | | | Update mailroom to 0.5.2 Fixes #2698 and #2711. See merge request !1424
| * Update mail_roomDouwe Maan2015-09-241-2/+2
| |
* | Add the newrelic-grape gemnewrelic-grapeJacob Vosmaer2015-09-241-3/+4
|/ | | | 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-2/+2
| | | | Also update Kaminari gem to the latest version
* Bump devise-two-factor to 2.0.0rs-bump-two-factorRobert Speicher2015-09-191-5/+4
| | | | | | 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-3/+9
|
* Fix 500 when accessing private project when not logged infix-ci-non-public-projectKamil Trzcinski2015-09-171-3/+0
|
* Merge branch 'update-mailroom' into 'master'Robert Speicher2015-09-161-2/+2
|\ | | | | | | See merge request !1306
| * Fix Gemfile.lockDouwe Maan2015-09-161-1/+1
| |
| * Merge branch 'master' into update-mailroomDouwe Maan2015-09-161-236/+275
| |\
| * | Update mail_roomDouwe Maan2015-09-161-2/+5
| | |
* | | Fix gemfile.lockDmitriy Zaporozhets2015-09-161-1/+4
| |/ |/|
* | Merge remote-tracking branch 'origin/master' into ↵ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gKamil Trzcinski2015-09-161-3/+3
|\ \ | |/ | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * bump fogbugz gemJared Szechy2015-09-151-2/+2
| |
* | Fix models/ci/mail_service_spec.rbKamil Trzcinski2015-09-151-9/+9
| | | | | | | | | | - 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/+1
| |
* | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-151-9/+5
|\ \ | |/ | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
| * Use fixed version of fogbugz gemJared Szechy2015-09-151-3/+3
| | | | | | | | This allows us to properly handle authentication errors.
| * Update gitlab_emoji to 0.1.1Robert Schilling2015-09-141-5/+2
| |
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-111-2/+2
|\ \ | |/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Bump rouge to 1.10.1Stan Hu2015-09-101-2/+2
| |
| * Bump rouge to 1.10 to remove warning noise and fix other syntax highlighting ↵Stan Hu2015-09-101-2/+2
| | | | | | | | | | | | | | | | bugs Closes #2128 Closes #2433
* | Fix brakemanDmitriy Zaporozhets2015-09-091-4/+4
| |
* | Fix spinach exceptionDmitriy Zaporozhets2015-09-091-1/+2
| |
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-091-7/+15
|\ \ | |/
| * FogBugz project importJared Szechy2015-09-081-0/+6
| |
| * Merge branch 'crowd' into 'master'Valery Sizov2015-09-071-0/+5
| |\ | | | | | | | | | | | | | | | | | | | | | Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228
| | * Crowd integrationValery Sizov2015-09-021-0/+5
| | |
| * | Update mail_room to 0.4.2 for better error handlingDouwe Maan2015-09-021-2/+5
| |/
| * Merge branch 'gitlab-git-http-server' into 'master'Dmitriy Zaporozhets2015-09-011-6/+0
| |\ | | | | | | | | | | | | | | | Replace grack with gitlab-git-http-server See merge request !1229
| | * Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-serverJacob Vosmaer2015-08-311-2/+2
| | |\
| | * | Replace grack with gitlab-git-http-serverJacob Vosmaer2015-08-311-6/+0
| | | |
| * | | Merge branch 'master' into 'master'Valery Sizov2015-09-011-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Update Racc to 1.4.12 The primary reason for this is that this would let me debug #2343 using Rubinius' `-Xic.debug` option. See merge request !1201
| | * | Update Racc to 1.4.12Yorick Peterse2015-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | This ensures GitLab can actually run Rubinius, previously it would segfault in Racc during the bootup phase.
| * | | Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded filesStan Hu2015-08-271-2/+2
| | |/ | |/| | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9577
* | | fix GemfileValery Sizov2015-09-091-8/+4
| | |
* | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-261-4/+4
|\ \ \ | |/ /
| * | Update mail_roomupdate-mail-roomDouwe Maan2015-08-261-2/+2
| |/
| * Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty modeStan Hu2015-08-231-2/+2
| | | | | | | | Closes #2271
* | Groundwork for merging CI into CEDouwe Maan2015-08-251-250/+294
|/
* Use canonical version of mail_room.Douwe Maan2015-08-201-8/+2
|
* Update mail_room.Douwe Maan2015-08-191-1/+1
|
* Changes and stuff.Douwe Maan2015-08-181-0/+2
|
* Update mail_roomDouwe Maan2015-08-181-1/+1
|
* Reply by email POCDouwe Maan2015-08-181-0/+8
|
* Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodulesStan Hu2015-08-171-2/+2
| | | | Closes #2262
* Bump omniauth-saml to 1.4.1rs-gem-securityRobert Speicher2015-08-141-6/+6
| | | | | | | 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-3/+7
| | | | 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.
* Merge branch 'optimize-haml-textarea-rendering' into 'master'Dmitriy Zaporozhets2015-08-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | Bump Haml to 4.0.7 to speed up textarea rendering The current regexp caused long load times when textarea blocks were surrounded by whitespace. This fix has been submitted to the Haml library and passes tests there: https://github.com/haml/haml/pull/850 Closes #1987 See merge request !984
View Lorry Controller Status