summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-1517-7/+235
|\
| * Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-141-0/+2
| |\ | | | | | | | | | | | | Simplify code around (cross)-references See merge request !1568
| | * Simplify code around (cross)-referencesDouwe Maan2015-10-121-0/+2
| | |
| * | Fix: Images cannot show when projects' path was changeduploads_path_fixValery Sizov2015-10-143-0/+84
| | |
| * | Merge remote-tracking branch 'origin/cernvcs_hide_passwrd'Valery Sizov2015-10-142-1/+13
| |\ \
| | * \ Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-cecernvcs_hide_passwrdValery Sizov2015-10-142-1/+13
| | |\ \
| | | * | Hide passwords to non-admin users in the services APIAlex Lossent2015-10-122-1/+13
| | | | | | | | | | | | | | | | | | | | In order to be consistent with !1490 doing it for the web interface
| * | | | Merge remote-tracking branch 'origin/inified_404_error'Valery Sizov2015-10-141-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Only render 404 page from /publicinified_404_errorValery Sizov2015-10-131-1/+1
| | |/ /
| * | | [ci skip] Fix wrong commentsue4452015-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | According to `attributes_for_keys` and API doc, `POST /projects/:id/merge_requests` is received `target_project_id` (NOT `target_project`)
| * | | Fix broken testsKamil Trzcinski2015-10-121-1/+1
| | | |
| * | | Fix some changesKamil Trzcinski2015-10-121-1/+1
| | | |
| * | | Update renderingKamil Trzcinski2015-10-121-1/+1
| | | |
| * | | Small bug fixesKamil Trzcinski2015-10-121-2/+3
| | | |
| * | | Add Commit Status documentationKamil Trzcinski2015-10-121-10/+10
| | | |
| * | | Add author to statusesKamil Trzcinski2015-10-122-1/+2
| | | |
| * | | Fix commit status POST URLKamil Trzcinski2015-10-121-1/+1
| | | |
| * | | Implement Commit Status APIKamil Trzcinski2015-10-124-3/+89
| |/ /
| * | Merge branch 'fix_email_downcasing' into 'master' Robert Speicher2015-10-111-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP email address downcasing Fixes #2960 In the event we cannot match an LDAP user by DN we attempt to find an identity by email address and then update the DN. In this case the identity is matched by email address. If the user's email address in LDAP has an upper case character we cannot find a match in the GitLab database. GitLab downcases emails before the user object is saved. This merge request downcases the email from LDAP before we lookup by email. I also added a test to prevent a regression. See merge request !1550
| | * Fix ldap email downcasing bugDrew Blessing2015-10-081-1/+1
| | |
| * | Merge branch 'rs-issue-2970' into 'master' Douwe Maan2015-10-091-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normalize space-like characters in keys before output to gitlab-shell gitlab-shell expects only one tab separator per key, and an SSH key with a tab character in the comment, for example, would break things. Closes #2970 See merge request !1552
| | * | Normalize space-like characters in keys before output to gitlab-shellrs-issue-2970Robert Speicher2015-10-081-1/+2
| | |/ | | | | | | | | | | | | | | | | | | gitlab-shell expects only one tab separator per key, and an SSH key with a tab character in the comment, for example, would break things. Closes #2970
| * | Merge branch 'rs-2fa-task' into 'master' Jacob Vosmaer2015-10-091-0/+23
| |\ \ | | |/ | |/| | | | | | | | | | | | | Add task to disable 2FA for all users Addresses #2971 See merge request !1532
| | * Add output and confirmation to gitlab:two_factor:disable_for_all_usersrs-2fa-taskRobert Speicher2015-10-081-2/+15
| | |
| | * Add gitlab:two_factor:disable_for_all_users taskRobert Speicher2015-10-071-0/+10
| | |
| * | Added dedicated Rake task for setting up PostgresYorick Peterse2015-10-082-0/+7
| | | | | | | | | | | | | | | This ensures any PostgreSQL specific schema changes (e.g. expression indexes) are created when setting up the database.
| * | Added methods for detecting MySQL/PostgreSQLYorick Peterse2015-10-071-0/+11
| |/ | | | | | | | | These two methods remove the need for manually going into ActiveRecord::Base.connection all over the place.
* | Fix NGINX API download regexJacob Vosmaer2015-10-142-2/+2
| | | | | | | | Users are allowed to supply namespace%2Fproject instead of a numeric ID
* | Let gitlab-git-http-server handle archive downloadsJacob Vosmaer2015-10-084-15/+47
|/ | | | This change relies on changes in gitlab_git and gitlab-git-http-server.
* Merge branch 'rs-remove-ci-disable'Kamil Trzcinski2015-10-052-10/+0
|\ | | | | | | See merge request !1512
| * Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-052-10/+0
| | | | | | | | | | | | This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe816b0c681ac218096b294311dd04fde8b
* | Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-052-3/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Ci::Commit and Ci::Build to have all builds for same :sha on single page This makes Ci::Commit to have only :sha and simplifies routing to have only :sha in path. The :ref and :push_data is now parameter of Ci::Build. All commit related data (git author, message and .gitlab-ci.yml) is read directly from repository. All code related for creating builds is moved to CreateBuildsService. Status deduction is rewritten to make if more efficient and easier to integrate with Commit Status API. This is partially working, tests are not yet touched. This slightly changes view of Commit: ![Screen_Shot_2015-10-02_at_15.21.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ad3f1ccdcc87659ea437d8db6c5b9f94/Screen_Shot_2015-10-02_at_15.21.47.png) @dzaporozhets What do you think? See merge request !1502
| * Fix next round of testsKamil Trzcinski2015-10-051-1/+1
| |
| * Make commit_spec runKamil Trzcinski2015-10-051-2/+2
| |
| * Add user to Ci::Build to have pusher email addressKamil Trzcinski2015-10-051-1/+1
| |
| * Refactor commit and buildKamil Trzcinski2015-10-051-0/+1
| |
* | Exclude benchmarks from the spec Rake taskYorick Peterse2015-10-051-1/+1
| |
* | Merge branch 'benchmark-suite' into 'master' Yorick Peterse2015-10-051-1/+10
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Basic RSpec/benchmark-ips powered benchmark suite Corresponding issue: #2909, see the commit messages for more details. A few things to note: 1. The current use of `subject` isn't exactly easy on the eyes due to them having to return a Proc, I'm not sure yet how (and if) we can work around this. 2. The maximum amount of iterations in the current `User.by_login` benchmark is arbitrary, we might have to adjust it once said method's performance has been improved. 3. Benchmarks currently take 2 seconds to warm up and 5 seconds to run (benchmark-ips defaults). 4. The custom RSpec matcher file (`benchmark_matchers.rb`) is a bit messy, any feedback on this would be appreciated Any comments/feedback on this would be greatly appreciated. See merge request !1503
| * Basic setup for an RSpec based benchmark suitebenchmark-suiteYorick Peterse2015-10-021-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This benchmark suite uses benchmark-ips (https://github.com/evanphx/benchmark-ips) behind the scenes. Specs can be turned into benchmark specs by setting "benchmark" to "true" in the top-level describe block like so: describe SomeClass, benchmark: true do end Writing benchmarks can be done using custom RSpec matchers, for example: describe MaruTheCat, benchmark: true do describe '#jump_in_box' do it 'should run 1000 iterations per second' do maru = described_class.new expect { maru.jump_in_box }.to iterate_per_second(1000) end end end By default the "iterate_per_second" expectation requires a standard deviation under 30% (this is just an arbitrary default for now). You can change this by chaining "with_maximum_stddev" on the expectation: expect { maru.jump_in_box }.to iterate_per_second(1000) .with_maximum_stddev(10) This will change the expectation to require a maximum deviation of 10%. Alternatively you can use the it block style to write specs: describe MaruTheCat, benchmark: true do describe '#jump_in_box' do subject { -> { described_class.new } } it { is_expected.to iterate_per_second(1000) } end end Because "iterate_per_second" operates on a block, opposed to a static value, the "subject" method must return a Proc. This looks a bit goofy but I have been unable to find a nice way around this.
* | Fix rubocop warnings in libGuilherme Garnier2015-10-036-9/+5
|/
* Merge branch 'show-diff-stats-for-mr'Dmitriy Zaporozhets2015-10-012-0/+16
|\
| * Show additions/deletions stats on merge request diffDmitriy Zaporozhets2015-10-012-0/+16
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix-work-with-multibyte-chars-in-ldap-uid' into 'master' Dmitriy Zaporozhets2015-10-011-1/+1
|\ \ | |/ |/| | | | | | | | | Add support of multibyte characters in LDAP UID See merge request !1472
| * Add support of multibyte characters in LDAP UIDПетров Роман2015-09-301-1/+1
| |
* | Delegate ci_project parameters to projectsKamil Trzcinski2015-09-301-19/+4
|/ | | | | | | - It delegates name, path, gitlab_url, ssh_url_to_repo - Remove ability to set this parameters using CI API This fixes GitLab project rename, namespace change, repository rename, etc.
* Merge branch 'master' into 'master' Jacob Vosmaer2015-09-291-3/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for AWS S3 Server-Side Encryption support This adds support for AWS S3 SSE with S3 managed keys, this means the data is encrypted at rest and the encryption is handled transparently to the end user as well as in the AWS Console. ## Points to double check I'm unsure on the best way to the handle the default. I've followed the `multipart_upload` de facto in the app. I'm happy to change this if required or if it will impact elsewhere e.g. omnibus packages I also think I've managed to catch all of the documentation for this change as well. ### Why is this required Many enterprises require good backup support but also for this to be encrypted. By default backups aren't encrypted, this allows at rest encryption to be supported in GitLab backups providing a layer of security should the physical media not be properly disposed of. Relates to issue #2478. See merge request !1280
| * Add support for AWS S3 Server-Side Encryption supportPaul Beattie2015-09-251-3/+4
| | | | | | | | | | | | | | This adds support for AWS S3 SSE with S3 managed keys, this means the data is encrypted at rest and the encryption is handled transparently to the end user as well as in the AWS Console. This is optional and not required to make S3 uploads work.
* | Merge branch 'orphaned-repo-cleanup' into 'master' Douwe Maan2015-09-291-34/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | Improve repo cleanup task I accidentally wrote a new script, not seeing we already had one. But the old one did not do enough (it only handled global namespace orhpans) so I figured I should just drop in the new script. See merge request !1298
| * | Guard against trailing slashes in repos_pathJacob Vosmaer2015-09-151-1/+5
| | |
| * | Improve repo cleanup taskJacob Vosmaer2015-09-151-34/+11
| | | | | | | | | | | | | | | Clean up more than just global (legacy) repos. Also, instead of deleting, just rename.