| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/import/google_code_controller.rb
|
| | | | |
|
| |\ \ \
| |/ /
|/| | |
upgrade hipchat
|
| | | | |
|
| | |/
|/|
| |
| | |
directories.
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| |
| | |
Only allow users to reference groups, projects, issues, MRs, commits they have access to.
Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183.
See merge request !1742
|
| | | |
|
| | | |
|
| | | |
|
| |/
|
|
| |
being rendered as error.
|
| |\ |
|
| | | |
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
Remove the email patches link for merge commits
Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches. This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit. Together these changes should prevent the 500 errors described in the issue.
cc @sytse
See merge request !1737
|
| | | |
|
| |/
|
|
| |
Add the sidetiq gem to the Gemfile to match EE.
|
| | |
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Revert "Increase timeout for Git-over-HTTP requests."
This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9.
For #2164
cc @marin @douwe
See merge request !1730
|
| | |
| |
| |
| |
| |
| |
| | |
This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9.
Conflicts:
Gemfile
|
| |/
|
|
| |
This reverts commit d70126c1fbc65c4feeea6fb45424f5d4a30bb797.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Update poltergeist to support phantomjs 2.0
In response to [my issue](https://gitlab.com/gitlab-org/gitlab-development-kit/issues/36) on the GDK.
PhantomJS 1.8 was not in the repo's anymore. Only poltergeist needed it, but they support PhantomJS 2.0 since 1.6.0. (next release since 1.5.1) [Their CHANGELOG](https://github.com/teampoltergeist/poltergeist/blob/master/CHANGELOG.md).
Tested locally with Ruby 2.1.5. As this took ages, I haven't tested further.
See merge request !403
|
| | | |
|
| |/ |
|
