| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Protect OmniAuth request phase against CSRF. | Douwe Maan | 2015-04-24 | 1 | -4/+4 |
| | | |||||
| * | Update jquery-atwho-rails | Robert Speicher | 2015-04-23 | 1 | -2/+2 |
| | | |||||
| * | Update d3_rails | Robert Speicher | 2015-04-23 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'rs-reply-hotkey' into 'master' | Dmitriy Zaporozhets | 2015-04-22 | 1 | -5/+11 |
| |\ | | | | | | | | | | | | | | | | | | | "Reply quoting selected text" shortcut/hotkey Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms. This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs. See merge request !1775 | ||||
| | * | Add jasmine-rails gem | Robert Speicher | 2015-04-18 | 1 | -0/+6 |
| | | | |||||
| | * | Update jasmine gem | Robert Speicher | 2015-04-18 | 1 | -5/+5 |
| | | | |||||
| * | | Update gitlab-grack to 2.0.2. | Marin Jankovski | 2015-04-22 | 1 | -2/+2 |
| | | | |||||
| * | | Change html-pipeline-gitlab gem to html-pipeline | Robert Speicher | 2015-04-21 | 1 | -7/+1 |
| | | | |||||
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-21 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/import/google_code_controller.rb | ||||
| | * | | Update gitlab-grack to 2.0.1 to get unicorn to stop creating zombies.gitlab-grack-2.0.1 | Douwe Maan | 2015-04-20 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #9058 from chulkilee/upgrade-hipchat | Jeroen van Baarsen | 2015-04-21 | 1 | -3/+5 |
| |\ \ \ | |/ / |/| | | upgrade hipchat | ||||
| | * | | upgrade hipchat | Chulki Lee | 2015-04-13 | 1 | -3/+5 |
| | | | | |||||
| * | | | Ignore submodules that are defined in .gitmodules but are checked in as ↵gitlab_git-7.1.10 | Douwe Maan | 2015-04-17 | 1 | -2/+2 |
| | |/ |/| | | | | | directories. | ||||
| * | | Update gitlab_git to ignore invalid lines in .gitmodules.gitlab_git-7.1.9 | Douwe Maan | 2015-04-17 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #9039 from gemnasium/update-gemnasium-gitlab-service-to-0-2-6 | Dmitriy Zaporozhets | 2015-04-15 | 1 | -1/+1 |
| |\ \ | |/ |/| | Update gemnasium-gitlab-service to 0.2.6 | ||||
| | * | Update gemnasium-gitlab-service to 0.2.6 | fabien | 2015-03-27 | 1 | -1/+1 |
| | | | | | | | | | Fix compatibily issue with Ruby 2.0 | ||||
| * | | Update redcarpet to 3.2.3 | Robert Speicher | 2015-04-09 | 1 | -2/+2 |
| | | | |||||
| * | | Update gitlab_git to 7.1.6 because 7.1.5 had broken language detection.emailsonpush-last-line | Douwe Maan | 2015-03-31 | 1 | -2/+2 |
| | | | |||||
| * | | Update gitlab_git to 7.1.5, to fix final line in EmailsOnPush email diff ↵ | Douwe Maan | 2015-03-31 | 1 | -2/+2 |
| | | | | | | | | | being rendered as error. | ||||
| * | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-03-29 | 1 | -3/+3 |
| |\ \ | |||||
| | * | | update acts-as-taggable-on | Nihad Abbasov | 2015-03-29 | 1 | -3/+3 |
| | |/ | |||||
| * | | Merge branch 'fix-plain-diffs' into 'master' | Dmitriy Zaporozhets | 2015-03-29 | 1 | -2/+2 |
| |\ \ | |/ |/| | | | | | | | | | | | | | | | Remove the email patches link for merge commits Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches. This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit. Together these changes should prevent the 500 errors described in the issue. cc @sytse See merge request !1737 | ||||
| | * | Upgrade gitlab_git gem to version 7.1.3 | Vinnie Okada | 2015-03-28 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'update-rugments' into 'master' | Dmitriy Zaporozhets | 2015-03-24 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Update rugments to 1.0.0.beta6 to fix C# highlighting. Fixes #1259. See merge request !435 | ||||
| | * | | Update rugments to 1.0.0.beta6 to fix C# highlighting.update-rugments | Douwe Maan | 2015-03-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Revert "Update gemnasium-gitlab-service gem" | Douwe Maan | 2015-03-23 | 1 | -1/+1 |
| |/ / | | | | | | | This reverts commit af522ede14cad4605bc7f0137ddf6950974eccce. | ||||
| * | | Add sidetiq dependency | Vinnie Okada | 2015-03-21 | 1 | -0/+6 |
| |/ | | | | Add the sidetiq gem to the Gemfile to match EE. | ||||
| * | gollum-lib update | Valery Sizov | 2015-03-20 | 1 | -6/+6 |
| | | |||||
| * | update doorkeeper to 2.1.3 | Valery Sizov | 2015-03-20 | 1 | -3/+3 |
| | | |||||
| * | Merge branch 'revert-unicorn-timeout' into 'master' | Dmitriy Zaporozhets | 2015-03-20 | 1 | -8/+0 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | Revert "Increase timeout for Git-over-HTTP requests." This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9. For #2164 cc @marin @douwe See merge request !1730 | ||||
| | * | Revert "Increase timeout for Git-over-HTTP requests." | Dmitriy Zaporozhets | 2015-03-19 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9. Conflicts: Gemfile | ||||
| * | | Revert "Update poltergeist to support phantomjs 2.0" | Dmitriy Zaporozhets | 2015-03-19 | 1 | -5/+3 |
| |/ | | | | This reverts commit d70126c1fbc65c4feeea6fb45424f5d4a30bb797. | ||||
| * | Merge branch 'version-bump-poltergeist' into 'master' | Dmitriy Zaporozhets | 2015-03-19 | 1 | -3/+5 |
| |\ | | | | | | | | | | | | | | | | | | | | | Update poltergeist to support phantomjs 2.0 In response to [my issue](https://gitlab.com/gitlab-org/gitlab-development-kit/issues/36) on the GDK. PhantomJS 1.8 was not in the repo's anymore. Only poltergeist needed it, but they support PhantomJS 2.0 since 1.6.0. (next release since 1.5.1) [Their CHANGELOG](https://github.com/teampoltergeist/poltergeist/blob/master/CHANGELOG.md). Tested locally with Ruby 2.1.5. As this took ages, I haven't tested further. See merge request !403 | ||||
| | * | Update poltergeist to support phantomjs 2.0 | Zeger-Jan van de Weg | 2015-03-19 | 1 | -3/+5 |
| | | | |||||
| * | | Update rugments, fixes #8976 | Stefan Tatschner | 2015-03-19 | 1 | -1/+1 |
| | | | |||||
| * | | Bump gitlab_git to 7.1.2 | Dmitriy Zaporozhets | 2015-03-18 | 1 | -2/+2 |
| |/ | |||||
| * | Merge branch 'update-grack' into 'master' | Dmitriy Zaporozhets | 2015-03-18 | 1 | -1/+1 |
| |\ | | | | | | | | | | | Update Grack. See merge request !1712 | ||||
| | * | Update Grack. | Douwe Maan | 2015-03-17 | 1 | -1/+1 |
| | | | |||||
| * | | Update omniauth-ldap. | Douwe Maan | 2015-03-17 | 1 | -4/+4 |
| |/ | |||||
| * | Merge branch 'remove_rubyracer' into 'master' | Marin Jankovski | 2015-03-16 | 1 | -6/+0 |
| |\ | | | | | | | | | | | Remove rubyracer gem See merge request !1706 | ||||
| | * | Remove rubyracer gem.remove_rubyracer | Marin Jankovski | 2015-03-13 | 1 | -6/+0 |
| | | | |||||
| * | | Prevent gitlab-shell character encoding issues by receiving its changes as ↵ | Douwe Maan | 2015-03-15 | 1 | -0/+1 |
| |/ | | | | raw data. | ||||
| * | Bump gitlab_git to 7.1.1 | Dmitriy Zaporozhets | 2015-03-13 | 1 | -2/+2 |
| | | | | | Verify found object is actually a commit in Commit.find | ||||
| * | Fix Gemfile.lock | Dmitriy Zaporozhets | 2015-03-11 | 1 | -5/+0 |
| | | |||||
| * | Merge branch 'master' into new-emoji | Dmitriy Zaporozhets | 2015-03-11 | 1 | -2/+7 |
| |\ | | | | | | | | | Conflicts: Gemfile.lock | ||||
| | * | Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues | Dmitriy Zaporozhets | 2015-03-11 | 1 | -3/+3 |
| | | | |||||
| * | | Update html-pipeline and emoji | Dmitriy Zaporozhets | 2015-03-11 | 1 | -8/+9 |
| |/ | |||||
| * | Merge branch 'bump_gitlab_git' into 'master' | Dmitriy Zaporozhets | 2015-03-05 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | Bump gitlab_git to fix 500 with annotated tags w/o message Should fix https://gitlab.com/gitlab-org/gitlab-ce/issues/1181 See merge request !1640 | ||||
| | * | Bump gitlab_git to fix 500 with annotated tags w/o message | Dmitriy Zaporozhets | 2015-03-05 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #8915 from gemnasium/update-gemnasium-to-0-2-5 | Robert Schilling | 2015-03-05 | 1 | -1/+1 |
| |\ \ | |/ |/| | Update gemnasium-gitlab-service gem | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |
path: root/Gemfile.lock