Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 2, 2015
  1. @randx

    Merge branch 'rs-gem-security' into 'master'

    randx authored
    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
Commits on Jun 10, 2015
  1. @randx

    Merge branch 'rs-pre-rspec-3' into 'master'

    randx authored
    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
  2. @randx

    Merge branch 'master' into 'master'

    randx authored
    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
Commits on Jun 5, 2015
  1. @randx

    Refactor web editor

    randx authored
    * 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>
Commits on Jun 2, 2015
  1. @randx

    Remove files in web editor using rugged

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Commits on Jun 1, 2015
  1. @randx

    Fix adding new file to empty repo

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  2. @randx

    Create and edit files in web editor via rugged

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  3. @randx

    Add comments about gitlab forks

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  4. @randx

    Exmplain gitlab-linguist fork existence

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Commits on May 29, 2015
  1. @randx

    Merge branch 'rs-teaspoon' into 'master'

    randx authored
    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
Commits on May 26, 2015
  1. @randx

    Merge branch 'rs-gems' into 'master'

    randx authored
    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
Commits on May 14, 2015
  1. @randx

    Merge branch 'omniauth-csrf' into 'master'

    randx authored
    Protect OmniAuth request phase against CSRF.
    
    Addresses #2268.
    
    See merge request !1793
Commits on May 12, 2015
  1. @randx

    Merge branch '2fa' into 'master'

    randx authored
    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 - attr-encrypted/attr_encrypted#155
    
    Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/4516817-implement-two-factor-authentication-2fa
    
    See merge request !474
  2. @randx

    Bump attr_encrypted

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Commits on May 9, 2015
  1. @randx @tsigo

    Use non-broken version of attr_encrypted

    randx authored tsigo committed
  2. @randx @tsigo

    Add 2 factor authentication gems

    randx authored tsigo committed
Commits on Apr 22, 2015
  1. @randx

    Merge branch 'rs-reply-hotkey' into 'master'

    randx authored
    "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
Commits on Apr 21, 2015
  1. @randx

    Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    
    Conflicts:
    	app/controllers/import/google_code_controller.rb
Commits on Apr 13, 2015
  1. @randx

    Merge branch 'reference-access-control' into 'master'

    randx authored
    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
Commits on Mar 29, 2015
  1. @randx
  2. @randx

    Merge branch 'fix-plain-diffs' into 'master'

    randx authored
    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
Commits on Mar 20, 2015
  1. @randx

    Merge branch 'revert-unicorn-timeout' into 'master'

    randx authored
    Revert "Increase timeout for Git-over-HTTP requests."
    
    This reverts commit 516bcab.
    
    For #2164
    
    cc @marin @douwe
    
    See merge request !1730
  2. @randx

    Revert "Update poltergeist to support phantomjs 2.0"

    randx authored
    This reverts commit d70126c.
  3. @randx

    Revert "Increase timeout for Git-over-HTTP requests."

    randx authored
    This reverts commit 516bcab.
    
    Conflicts:
    	Gemfile
Commits on Mar 19, 2015
  1. @randx

    Merge branch 'version-bump-poltergeist' into 'master'

    randx authored
    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
Commits on Mar 18, 2015
  1. @randx

    Bump gitlab_git to 7.1.2

    randx authored
Commits on Mar 13, 2015
  1. @randx

    Bump gitlab_git to 7.1.1

    randx authored
    Verify found object is actually a commit in Commit.find
Commits on Mar 12, 2015
  1. @randx

    Merge branch 'master' into new-emoji

    randx authored
    Conflicts:
    	Gemfile.lock
Commits on Mar 11, 2015
  1. @randx

    Update html-pipeline and emoji

    randx authored
  2. @randx
Commits on Mar 5, 2015
  1. @randx
  2. @randx

    Merge branch 'timeout' into 'master'

    randx authored
    Increase timeout for Git-over-HTTP requests.
    
    Fixes #2081 and https://gitlab.com/gitlab-org/gitlab-ce/issues/232.
    
    Normal web requests are bound by the `Rack::Timeout` timeout of 60 seconds, while Grack Git-over-HTTP requests are only bound by Unicorn's timeout which is now set to 1 hour, which should be plenty.
    
    The omnibus package should be updated to no longer use `unicorn['worker_timeout']` for the Unicorn timeout, but to set the `Slowpoke.timeout`.
    
    See merge request !1619
Commits on Mar 4, 2015
  1. @randx

    Update spring to 1.3.3

    randx authored
  2. @randx

    Bump gitlab_git to rc15

    randx authored
Commits on Mar 3, 2015
  1. @randx

    Add brakeman gem

    randx authored
Something went wrong with that request. Please try again.