summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Show a notice for diffs that are too largehide-large-diffsYorick Peterse2016-03-181-1/+1
| | | | | | | This builds on the changes introduced in https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results in merge requests with large diffs (e.g. due to them containing minified CSS) loading much faster.
* Added omniauth-auth0 Gem + Applicable Documentation.Daniel Carraro2016-03-161-0/+1
|
* Support Wiki with UTF-8 page nameHiroyuki Sato2016-03-161-1/+3
|
* Merge branch 'css-style-guide' into 'master' Jacob Schatz2016-03-151-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSS style guide Working towards what was discussed in #13552, this adds the [SCSS Linter gem](https://github.com/brigade/scss-lint) for style guide conformity in CI. TODO: - [x] Agree on and write SCSS Style Guide Documentation. - [x] Document the `scss-lint` config file. - [x] Figure out how best to run this in CI, right now it's taking longer than I would think it should. - [x] Use CSSComb for auto-correction (Maybe just include a CSSComb config file and have developers run the node package manually if they're interested in using it?). My logic for not using CSSComb in the first place is that, AFAIK, we don't currently require Node/NPM, even in the dev environment. Maybe I'm wrong about that? `scss-lint` is a Ruby implementation of a similar concept, but it doesn't include autocorrect. Is there a way we can run get GitLab CI to run `scss-lint` without having to put together the full GitLab application? Seeing as it's just static analysis, it seems like a waste of time/resources. /cc @jschatz1 @rspeicher See merge request !3069
| * Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add ↵connorshea2016-03-141-0/+1
| | | | | | | | | | | | documentation for SCSS Style Guide. See !3069 for more information.
* | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-croppingRémy Coutable2016-03-151-3/+0
| | | | | | | | | | This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
* | Bump Capybara gem to 2.6.2Stan Hu2016-03-141-1/+1
|/
* Upgrade `omniauth-saml` to 1.5.0 and document it's new capabilities.Patricio Cano2016-03-101-1/+1
|
* Merge branch 'rs-bump-poltergeist' into 'master' Dmitriy Zaporozhets2016-03-091-1/+1
|\ | | | | | | | | | | | | Bump poltergeist to `~> 1.9.0` See merge request !3116
| * Bump poltergeist to `~> 1.9.0`rs-bump-poltergeistRobert Speicher2016-03-071-1/+1
| |
* | Retry spinach testsKamil Trzcinski2016-03-091-0/+1
| |
* | Retry failed testsKamil Trzcinski2016-03-091-0/+1
|/
* Merge branch 'issue_2805' into 'master' Douwe Maan2016-03-051-1/+1
|\ | | | | | | | | | | | | Upgrade carrierwave to 0.10.0. Closes #2805 See merge request !3084
| * Upgrade carrierwave to 0.10.0.issue_2805Rubén Dávila2016-03-031-1/+1
| |
* | Bump factory_girl_rails to ~> 4.6.0Robert Speicher2016-03-041-4/+4
| |
* | Update spring to 1.6.4 to fix support for Bundler 1.11Gabriel Mazetto2016-03-031-1/+1
| |
* | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-1/+1
|/
* Bump sprockets to `~> 3.3.5`rs-update-sprocketsRobert Speicher2016-03-011-3/+3
| | | | Closes #6069
* Update Rails to 4.2.5.2Robert Speicher2016-02-291-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-ngprogressPhil Hughes2016-02-291-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-croppingAlfredo Sumaran2016-02-241-0/+2
|\
| * Merge branch 'bring-back-newrelic-gem' into 'master' Rémy Coutable2016-02-241-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 Hu2016-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | | This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock
* | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-231-4/+4
|\ \ \ | |/ /
| * | Update sentry-raven to 0.15.6Robert Speicher2016-02-231-1/+1
| |/
| * Upgrade gitlab_git to 8.2.0Rubén Dávila2016-02-191-1/+1
| |
| * Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-191-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
| | * Update gitlab_emoji to ~> 0.3.0Robert Speicher2016-02-121-1/+1
| | |
| * | Bump unicorn to `~> 4.9.0`rs-update-unicornRobert Speicher2016-02-161-1/+1
| | |
* | | Merge branch 'master' into avatar-croppingJohann Pardanaud2016-02-161-2/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: app/models/user.rb
| * | Update omniauth to 1.3.1 for memory performanceTakuya Noguchi2016-02-131-1/+1
| |/
| * Loosen Nokogiri version requirementrs-loosen-nokogiriRobert Speicher2016-02-111-1/+1
| | | | | | | | Closes #13218
* | Fix #7959: Fix avatar stretching by providing a cropping featureJohann Pardanaud2016-02-091-0/+3
|/
* Merge branch 'improve-diverging-commit-counts' into 'master' Robert Speicher2016-02-051-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-countsYorick Peterse2016-02-041-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 Zaporozhets2016-02-041-2/+0
|\ \ | |/ |/| | | | | | | | | Remove newrelic gem. Closes #12860 See merge request !2682
| * Remove newrelic gem. Closes #12860remove-newrelicJosh Frye2016-02-031-2/+0
| |
* | Updated omniuath-saml to the latest version.omniauth-saml-updatePatricio Cano2016-02-031-1/+1
|/
* Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-031-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 APIStan Hu2016-02-021-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 Zaporozhets2016-02-021-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 Hu2016-01-301-1/+0
| | | | | | | | | | | | https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/grape-instrumentation
| * | Bump New Relic gem version to avoid warnings in Web pageStan Hu2016-01-301-1/+1
| | |
* | | Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobsJacob Vosmaer2016-02-021-0/+3
|\ \ \ | | |/ | |/|
| * | Render sanitized SVG imagesStan Hu2016-02-011-0/+3
| |/ | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9265
* | Use gitlab_git 8.0.0Jacob Vosmaer2016-02-021-1/+1
| |
* | Develop with a custom gitlab_git branchJacob Vosmaer2016-02-011-1/+1
|/
* Merge branch 'rs-bump-octokit' into 'master' Dmitriy Zaporozhets2016-01-271-1/+1
|\ | | | | | | | | | | | | Bump octokit to `~> 3.8.0` Closes #2877 See merge request !2536
| * Bump octokit to `~> 3.8.0`rs-bump-octokitRobert Speicher2016-01-211-1/+1
| | | | | | | | Closes #2877
* | Update rails, rails-html-sanitizer, and nokogiri for security fixesrs-rails-securityRobert Speicher2016-01-251-2/+3
| | | | | | | | See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643
View Lorry Controller Status