summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs-gem-security' into 'master'Dmitriy Zaporozhets2015-07-021-21/+30
|\ | | | | | | | | | | | | | | | | | | | | | | 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-21/+30
| | | | | | | | | | | | | | | | - 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)
* | Bump Redcarpet to 3.3.2rs-issue-1911Robert Speicher2015-06-301-2/+2
|/ | | | Closes #1911
* Merge branch 'fix-c-prototype-highlighting' into 'master'Stan Hu2015-06-301-2/+2
|\ | | | | | | | | | | | | | | Bump rugments to 1.0.0beta8 to fix C prototype function highlighting Closes #1890 See merge request !902
| * Bump rugments to v1.0.0beta8 to fix C prototype function highlightingStan Hu2015-06-281-2/+2
| | | | | | | | Closes #1890
* | Add Fuubar gemRobert Speicher2015-06-251-1/+9
|/
* Updated the categories of Application Settings FormDarby2015-06-231-0/+3
|
* Bump pg gem to 0.18.2Robert Speicher2015-06-221-1/+1
|
* Bump database_cleaner to ~> 1.4.0Robert Speicher2015-06-221-5/+2
|
* Bump rspec to 3.3.0Robert Speicher2015-06-221-19/+23
|
* Update email_spec gemRobert Speicher2015-06-221-3/+3
| | | | | | This fixes spec/mailers/notify_spec Also only require email_spec in the one place it's used
* Bump poltergeist to 1.6.0Robert Speicher2015-06-221-3/+5
|
* Upgrade to newer version of CapybaraJeroen van Baarsen2015-06-221-2/+2
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Started on the actual rspec 3 upgradeJeroen van Baarsen2015-06-221-13/+14
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Bump gitlab_git to 7.2.5Jacob Vosmaer2015-06-221-2/+2
|
* Merge branch 'placeholder_text'Dmitriy Zaporozhets2015-06-171-3/+0
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: Gemfile.lock
| * Changed the placeholder text and modified the css class to make it visibleplaceholder_textDarby2015-06-161-0/+3
| |
* | Bump jquery-rails gem versionrs-rails-updateRobert Speicher2015-06-161-2/+2
| |
* | Bump rails to 4.1.11, and make the version requirement exactRobert Speicher2015-06-161-30/+33
|/
* Update Redcarpet to 3.3.0rs-issue-1432Robert Speicher2015-06-131-2/+2
| | | | Fixes #1432
* Merge branch 'rs-pre-rspec-3' into 'master'Dmitriy Zaporozhets2015-06-101-9/+9
|\ | | | | | | | | | | | | | | Changes back-ported from rspec3 branch This is just breaking up the large `road-to-rspec-3` branch a bit. Each of these commits have been cherry-picked and would be good to have in place before the upgrade. See merge request !792
| * Bump shoulda-matchers and webmock gem versionsRobert Speicher2015-06-101-9/+9
| |
* | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-06-101-15/+67
|\ \ | | | | | | | | | | | | | | | | | | | | | update fog to 1.25.0 and add multipart upload support This merge will fix backup uploading problems to s3, closing gitlab-org/gitlab-ce#1059 See merge request !789
| * | update fog to 1.25.0 and add multipart upload supportJeroen Nijhof2015-06-091-15/+67
| |/
* | Update browser gem to version 0.8.0 for IE11 supportStan Hu2015-06-091-2/+2
|/ | | | Closes #1775
* Refactor web editorrefactor-web-editorDmitriy Zaporozhets2015-06-051-2/+2
| | | | | | | | | | * fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove GuardRobert Speicher2015-06-031-23/+0
| | | | None of the GitLab B.V. developers were using it.
* Bump jquery-rails versionRobert Speicher2015-06-021-2/+2
|
* Remove now-unused `escaped_autolink` helper and rails_autolink gemRobert Speicher2015-06-021-3/+0
|
* Remove files in web editor using ruggedDmitriy Zaporozhets2015-06-021-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix adding new file to empty repoDmitriy Zaporozhets2015-06-011-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Create and edit files in web editor via ruggedDmitriy Zaporozhets2015-06-011-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'feature/saml_support' into 'master'Douwe Maan2015-05-291-0/+12
|\ | | | | | | | | | | | | | | Add SAML support via Omniauth Split of !669, with doc See merge request !722
| * Add SAML support via OmniauthAlex Lossent2015-05-271-0/+12
| |
* | Merge branch 'rs-teaspoon' into 'master'Dmitriy Zaporozhets2015-05-291-10/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Teaspoon for Javascript testing Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect. See https://github.com/modeset/teaspoon See merge request !715
| * | Remove jasmine-rails; add teaspoonRobert Speicher2015-05-281-10/+11
| | |
* | | Bump turbolinks versionRobert Speicher2015-05-291-6/+6
|/ /
* | Fix git blame syntax highlighting when different commits break up linesStan Hu2015-05-271-2/+2
|/ | | | Closes #1521
* Merge branch 'rs-gems' into 'master'Dmitriy Zaporozhets2015-05-261-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | Update ffaker gem Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`. Prior, if a new developer checked out the repo, ran `bundle install` and then tried `rake dev:setup`, seeding would fail due to having the latest version of ffaker without the API changes in this MR. Also updates `spring` version and the binstubs, just for kicks. See merge request !686
| * Update ffaker gemRobert Speicher2015-05-201-5/+5
| | | | | | | | | | | | Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`.
| * Update spring, re-run binstubsRobert Speicher2015-05-201-1/+1
| |
* | Remove Rack Attack monkey patches and bump to version 4.3.0Stan Hu2015-05-221-2/+2
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJob van der Voort2015-05-211-3/+3
|\ \ | |/
| * Subclass TaskList::Filter to fix a bugrs-issue-1645Robert Speicher2015-05-201-3/+3
| | | | | | | | | | | | | | | | | | Instead of using a fork, we subclass the filter and only apply the `task-list` class to list items that actually are task lists. Closes #1645 See https://github.com/github/task_list/pull/60
* | Updated the gitlab_git gemJeroen van Baarsen2015-05-211-4/+4
|/ | | | | | | | | | | | **What does this do?** It updated the version of gitlab_git to the latest version **Why is this needed?* There was a bug in rugged (dependency of gitlab_git) that causes a segfault error when seeding the database. That error has been fixed and the fix is in the latest version of gitlab_git Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Update asciidoctor gem to the latest versionJakub Jirutka2015-05-181-2/+2
|
* Fix gemfile.lockDmitriy Zaporozhets2015-05-151-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'fix-blob-path' into 'master'Douwe Maan2015-05-141-1/+1
|\ | | | | | | | | | | | | | | | | | | Fix broken view when viewing history of a file that includes a path that used to be another file Requires gitlab_git to v7.1.12 to be tagged and released. Closes #1598 See merge request !651
| * Fix broken view when viewing history of a file that includes a path that ↵Stan Hu2015-05-131-1/+1
| | | | | | | | | | | | used to be another file Closes #1598
* | Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets2015-05-141-4/+4
|\ \ | |/ |/| | | | | | | | | | | Protect OmniAuth request phase against CSRF. Addresses #2268. See merge request !1793
View Lorry Controller Status