Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/Gemfile
AgeCommit message (Collapse)Author
2015-06-17Bump jquery-rails gem versionRobert Speicher
2015-06-17Bump rails to 4.1.11, and make the version requirement exactRobert Speicher
2015-06-14Update Redcarpet to 3.3.0Robert Speicher
Fixes #1432
2015-06-10Merge branch 'rs-pre-rspec-3' into 'master'Dmitriy Zaporozhets
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
2015-06-10Merge branch 'master' into 'master'Dmitriy Zaporozhets
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
2015-06-10Fix shoulda-matchers requireRobert Speicher
2015-06-10Bump shoulda-matchers and webmock gem versionsRobert Speicher
2015-06-10Update browser gem to version 0.8.0 for IE11 supportStan Hu
Closes #1775
2015-06-09update fog to 1.25.0 and add multipart upload supportJeroen Nijhof
2015-06-05Refactor web editorDmitriy Zaporozhets
* 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>
2015-06-04Remove GuardRobert Speicher
None of the GitLab B.V. developers were using it.
2015-06-03Bump jquery-rails versionRobert Speicher
2015-06-02Remove now-unused `escaped_autolink` helper and rails_autolink gemRobert Speicher
2015-06-02Remove files in web editor using ruggedDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-01Fix adding new file to empty repoDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-01Create and edit files in web editor via ruggedDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-01Add comments about gitlab forksDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-01Exmplain gitlab-linguist fork existenceDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29Merge branch 'feature/saml_support' into 'master'Douwe Maan
Add SAML support via Omniauth Split of !669, with doc See merge request !722
2015-05-29Merge branch 'rs-teaspoon' into 'master'Dmitriy Zaporozhets
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
2015-05-29Bump turbolinks versionRobert Speicher
2015-05-29Remove jasmine-rails; add teaspoonRobert Speicher
2015-05-28Fix git blame syntax highlighting when different commits break up linesStan Hu
Closes #1521
2015-05-27Add SAML support via OmniauthAlex Lossent
2015-05-26Merge branch 'rs-gems' into 'master'Dmitriy Zaporozhets
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
2015-05-22Remove Rack Attack monkey patches and bump to version 4.3.0Stan Hu
2015-05-21Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJob van der Voort
2015-05-21Updated the gitlab_git gemJeroen van Baarsen
**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>
2015-05-21Update ffaker gemRobert Speicher
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`.
2015-05-20Subclass TaskList::Filter to fix a bugRobert Speicher
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
2015-05-18Update asciidoctor gem to the latest versionJakub Jirutka
2015-05-14Merge branch 'fix-blob-path' into 'master'Douwe Maan
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
2015-05-14Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets
Protect OmniAuth request phase against CSRF. Addresses #2268. See merge request !1793
2015-05-14Fix broken view when viewing history of a file that includes a path that ↵Stan Hu
used to be another file Closes #1598
2015-05-12Merge branch '2fa' into 'master'Dmitriy Zaporozhets
Two-factor authentication Implement's Two-factor authentication using tokens. - [X] Authentication logic - [X] Enable/disable 2FA feature - [x] Make 2-step login process if 2FA enabled - [x] Backup codes - [x] Backup code removed after being used - [x] Check backup codes for mysql db (mention mysql limitation if applied) - [x] Add tests - [x] Test if https://github.com/tinfoil/devise-two-factor#disabling-automatic-login-after-password-resets applies, and address if so - [x] Wait for fixed version of `attr_encrypted` or fork and use forked version - https://github.com/attr-encrypted/attr_encrypted/issues/155 Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/4516817-implement-two-factor-authentication-2fa See merge request !474
2015-05-12Merge branch 'fix-tags-view-with-submodules' into 'master'Douwe Maan
Bump gitlab_git to 7.1.11 to fix bug with viewing a tag on a project with submodules This is a reminder MR to bump gitlab_git before the release. Tests will fail until this happens. Closes https://github.com/gitlabhq/gitlabhq/issues/8411 See merge request !607
2015-05-12Bump attr_encryptedDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-11Make omniauth-kerberos dependency optional (add group 'kerberos')Jakub Jirutka
2015-05-10Use non-broken version of attr_encryptedDmitriy Zaporozhets
2015-05-10Add 2 factor authentication gemsDmitriy Zaporozhets
2015-05-06Remove 'jasmine' gemRobert Speicher
jasmine-rails still requires it as a dependency, but for some reason running `rake jasmine:ci` produced test failures but `rake spec:javascript` didn't.
2015-05-06Add task_list gemRobert Speicher
2015-05-04Bump gitlab_git to 7.1.11 to fix bug where viewing a tag on a project with ↵Stan Hu
submodules would return a 500 error Closes https://github.com/gitlabhq/gitlabhq/issues/8411
2015-04-27Add a rake task to automatically restart foreman when changes occurjubianchi
2015-04-26Add capybara-screenshot gemRobert Speicher
2015-04-24Protect OmniAuth request phase against CSRF.Douwe Maan
2015-04-23Update jquery-atwho-railsRobert Speicher
2015-04-23Update d3_railsRobert Speicher
2015-04-22Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets
"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
2015-04-22Update gitlab-grack to 2.0.2.Marin Jankovski
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-10 13:12:42 +0300