| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'rs-bump-poltergeist' into 'master' | Dmitriy Zaporozhets | 2016-03-09 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Bump poltergeist to `~> 1.9.0` See merge request !3116 | ||||
| | * | Bump poltergeist to `~> 1.9.0`rs-bump-poltergeist | Robert Speicher | 2016-03-07 | 1 | -1/+1 |
| | | | |||||
| * | | Retry spinach tests | Kamil Trzcinski | 2016-03-09 | 1 | -0/+1 |
| | | | |||||
| * | | Retry failed tests | Kamil Trzcinski | 2016-03-09 | 1 | -0/+1 |
| |/ | |||||
| * | Merge branch 'issue_2805' into 'master' | Douwe Maan | 2016-03-05 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Upgrade carrierwave to 0.10.0. Closes #2805 See merge request !3084 | ||||
| | * | Upgrade carrierwave to 0.10.0.issue_2805 | Rubén Dávila | 2016-03-03 | 1 | -1/+1 |
| | | | |||||
| * | | Bump factory_girl_rails to ~> 4.6.0 | Robert Speicher | 2016-03-04 | 1 | -4/+4 |
| | | | |||||
| * | | Update spring to 1.6.4 to fix support for Bundler 1.11 | Gabriel Mazetto | 2016-03-03 | 1 | -1/+1 |
| | | | |||||
| * | | Use Gitlab::Git::DiffCollections | Jacob Vosmaer | 2016-03-03 | 1 | -1/+1 |
| |/ | |||||
| * | Bump sprockets to `~> 3.3.5`rs-update-sprockets | Robert Speicher | 2016-03-01 | 1 | -3/+3 |
| | | | | | Closes #6069 | ||||
| * | Update Rails to 4.2.5.2 | Robert Speicher | 2016-02-29 | 1 | -1/+1 |
| | | | | | | See https://groups.google.com/forum/#!msg/rubyonrails-security/ddY6HgqB2z4/we0RasMZIAAJ and https://groups.google.com/forum/#!msg/rubyonrails-security/ly-IH-fxr_Q/WLoOhcMZIAAJ | ||||
| * | Removed NGProgressremoved-ngprogress | Phil Hughes | 2016-02-29 | 1 | -1/+0 |
| | | | | | | | In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator Ref #13820 | ||||
| * | Merge branch 'master' into avatar-cropping | Alfredo Sumaran | 2016-02-24 | 1 | -0/+2 |
| |\ | |||||
| | * | Merge branch 'bring-back-newrelic-gem' into 'master' | Rémy Coutable | 2016-02-24 | 1 | -0/+2 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Remove newrelic gem. Closes #12860" This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock See merge request !2943 | ||||
| | | * | Revert "Remove newrelic gem. Closes #12860" | Stan Hu | 2016-02-23 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock | ||||
| * | | | Merge branch 'master' into avatar-cropping | Alfredo Sumaran | 2016-02-23 | 1 | -4/+4 |
| |\ \ \ | |/ / | |||||
| | * | | Update sentry-raven to 0.15.6 | Robert Speicher | 2016-02-23 | 1 | -1/+1 |
| | |/ | |||||
| | * | Upgrade gitlab_git to 8.2.0 | Rubén Dávila | 2016-02-19 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'rs-emoji' into 'master' | Douwe Maan | 2016-02-19 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | -----  |  See merge request !2800 | ||||
| | | * | Update gitlab_emoji to ~> 0.3.0 | Robert Speicher | 2016-02-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | Bump unicorn to `~> 4.9.0`rs-update-unicorn | Robert Speicher | 2016-02-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into avatar-cropping | Johann Pardanaud | 2016-02-16 | 1 | -2/+2 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: app/models/user.rb | ||||
| | * | | Update omniauth to 1.3.1 for memory performance | Takuya Noguchi | 2016-02-13 | 1 | -1/+1 |
| | |/ | |||||
| | * | Loosen Nokogiri version requirementrs-loosen-nokogiri | Robert Speicher | 2016-02-11 | 1 | -1/+1 |
| | | | | | | | | | Closes #13218 | ||||
| * | | Fix #7959: Fix avatar stretching by providing a cropping feature | Johann Pardanaud | 2016-02-09 | 1 | -0/+3 |
| |/ | |||||
| * | Merge branch 'improve-diverging-commit-counts' into 'master' | Robert Speicher | 2016-02-05 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | Dedicated method for counting commits between refs Corresponding gitlab_git merge request: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/66 Issue that lead to these changes: https://gitlab.com/gitlab-org/gitlab-ce/issues/12619 See merge request !2707 | ||||
| | * | Dedicated method for counting commits between refsimprove-diverging-commit-counts | Yorick Peterse | 2016-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | gitlab_git 8.1 adds the ability to count the amount of commits between two references without having to allocate anything but regular Rugged::Commit objects. This in turn speeds up the process of counting the number of commits a branch is ahead/behind by about 3.5x. | ||||
| * | | Merge branch 'remove-newrelic' into 'master' | Dmitriy Zaporozhets | 2016-02-04 | 1 | -2/+0 |
| |\ \ | |/ |/| | | | | | | | | | Remove newrelic gem. Closes #12860 See merge request !2682 | ||||
| | * | Remove newrelic gem. Closes #12860remove-newrelic | Josh Frye | 2016-02-03 | 1 | -2/+0 |
| | | | |||||
| * | | Updated omniuath-saml to the latest version.omniauth-saml-update | Patricio Cano | 2016-02-03 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'support-akismet' into 'master' | Robert Speicher | 2016-02-03 | 1 | -1/+2 |
| |\ | | | | | | | | | | | | | | | | | | | Support Akismet spam checking for creation of issues via API Currently any spam detected by Akismet for non-members via API will be logged in a separate table in the admin page. Closes #5612 See merge request !2266 | ||||
| | * | Support Akismet spam checking for creation of issues via API | Stan Hu | 2016-02-02 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612 | ||||
| * | | Merge branch 'update-newrelic-gem' into 'master' | Dmitriy Zaporozhets | 2016-02-02 | 1 | -2/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump New Relic gem version to avoid warnings in Web page This version has support for Grape, so we should consider removing the newrelic-grape gem as well: https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/grape-instrumentation See merge request !2578 | ||||
| | * | | Remove newrelic_grape gem since the New Relic gem now provides native support: | Stan Hu | 2016-01-30 | 1 | -1/+0 |
| | | | | | | | | | | | | | https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/grape-instrumentation | ||||
| | * | | Bump New Relic gem version to avoid warnings in Web page | Stan Hu | 2016-01-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobs | Jacob Vosmaer | 2016-02-02 | 1 | -0/+3 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Render sanitized SVG images | Stan Hu | 2016-02-01 | 1 | -0/+3 |
| | |/ | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9265 | ||||
| * | | Use gitlab_git 8.0.0 | Jacob Vosmaer | 2016-02-02 | 1 | -1/+1 |
| | | | |||||
| * | | Develop with a custom gitlab_git branch | Jacob Vosmaer | 2016-02-01 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'rs-bump-octokit' into 'master' | Dmitriy Zaporozhets | 2016-01-27 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Bump octokit to `~> 3.8.0` Closes #2877 See merge request !2536 | ||||
| | * | Bump octokit to `~> 3.8.0`rs-bump-octokit | Robert Speicher | 2016-01-21 | 1 | -1/+1 |
| | | | | | | | | | Closes #2877 | ||||
| * | | Update rails, rails-html-sanitizer, and nokogiri for security fixesrs-rails-security | Robert Speicher | 2016-01-25 | 1 | -2/+3 |
| | | | | | | | | | See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643 | ||||
| * | | rails updated to 4.2.5rails_update | Valery Sizov | 2016-01-25 | 1 | -1/+1 |
| | | | |||||
| * | | Don't use production section for Gemfile | Dmitriy Zaporozhets | 2016-01-22 | 1 | -3/+3 |
| |/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'sentry-integration' into 'master' | Robert Speicher | 2016-01-20 | 1 | -0/+3 |
| |\ | | | | | | | | | | | | | | | | | | | | | Add sentry integration Sentry is an event logging platform primarily focused on capturing and aggregating exceptions. With this MR it will be possible to log and track exceptions from GitLab to Sentry. https://gitlab.com/gitlab-com/operations/issues/39 See merge request !2485 | ||||
| | * | Use sentry in env production only | Jeroen Nijhof | 2016-01-20 | 1 | -3/+3 |
| | | | |||||
| | * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵ | Jeroen Nijhof | 2016-01-20 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | | | sentry-integration Conflicts: db/schema.rb | ||||
| | * | | Add sentry integration | Jeroen Nijhof | 2016-01-18 | 1 | -0/+3 |
| | | | | |||||
| * | | | updated gitlab_git to fix issue #5858 and updated changelog | James Lopez | 2016-01-20 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | Update devise to version 3.5.4 | Douglas Barbosa Alexandre | 2016-01-18 | 1 | -1/+1 |
| |/ | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |