| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Fixes #1432
|
| |\
| |
| |
| |
| |
| |
| |
| | |
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
|
| | | |
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |/ |
|
| |/
|
|
| |
Closes #1775
|
| |
|
|
|
|
|
|
|
|
| |
* 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>
|
| |
|
|
| |
None of the GitLab B.V. developers were using it.
|
| | |
|
| | |
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\
| |
| |
| |
| |
| |
| |
| | |
Add SAML support via Omniauth
Split of !669, with doc
See merge request !722
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | | |
|
| |/ / |
|
| |/
|
|
| |
Closes #1521
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| | |
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`.
|
| | | |
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |/
|
|
|
|
|
|
|
|
|
|
| |
**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>
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| | |
used to be another file
Closes #1598
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| | |
Protect OmniAuth request phase against CSRF.
Addresses #2268.
See merge request !1793
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | | |
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
submodules would return a 500 error
Closes https://github.com/gitlabhq/gitlabhq/issues/8411
|
| | |/ /
|/| | |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| |/ / |
|
| | | |
|
| |/ |
|
| | |
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
"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
|
| | | |
|
| | | |
|
| | | |
|
