summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7558 from bbodenmiller/patch-4Dmitriy Zaporozhets2014-08-231-1/+1
|\ | | | | change X-Frame-Options to SAMEORIGIN for nginx SSL config
| * change X-Frame-Options to SAMEORIGINBen Bodenmiller2014-08-231-1/+1
| | | | | | needed to allow sidekiq to load on background jobs tab
* | Merge branch 'blacklist/unsubscribes' into 'master'Dmitriy Zaporozhets2014-08-231-1/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | Add 'unsubscribes' to the paths blacklist This is to prevent issues with the admin email feature in GitLab EE. See merge request !1034
| * | Add 'unsubscribes' to the paths blacklistJacob Vosmaer2014-08-221-0/+1
| | | | | | | | | | | | GitLab EE has a /unsubscribes/ route.
| * | Use one word per line in Gitlab::BlacklistJacob Vosmaer2014-08-221-1/+23
| | |
* | | Merge branch 'always_set_satellite_origin' into 'master'Dmitriy Zaporozhets2014-08-231-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | Always set satellite origin See merge request !1036
| * | | Always set the origin remote in satellite actionsJacob Vosmaer2014-08-221-0/+1
| |/ / | | | | | | | | | | | | This prevents issues with satellites containing outdated origin remotes after administrators move the git repositories directory.
* | | unify nginx config filesBen Bodenmiller2014-08-232-46/+64
| |/ |/|
* | Simplify the description of single hash lines based on comments of Ben ↵Sytse Sijbrandij2014-08-221-2/+1
|/ | | | Bodenmiller.
* Fix tests after #7526Robert Schilling2014-08-201-5/+6
|
* Improve labels validation and expose error messagesjubianchi2014-08-202-7/+12
|
* Merge pull request #7527 from Razer6/api_labels_return_codeJacob Vosmaer2014-08-181-2/+2
|\ | | | | API: Fix labels return code
| * Fix labels return codeRobert Schilling2014-08-181-2/+2
| |
* | Add labels api authorization. Update permission docDmitriy Zaporozhets2014-08-151-0/+3
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #7479 from Razer6/feature/labels_apiDmitriy Zaporozhets2014-08-154-12/+102
|\ | | | | Implement complete labels API (create/delete/update)
| * Update labels via APIRobert Schilling2014-08-131-0/+35
| |
| * Add, delete labels via APIRobert Schilling2014-08-134-12/+67
| |
* | Merge pull request #7465 from Razer6/better_label_color_validationDmitriy Zaporozhets2014-08-153-4/+44
|\ \ | | | | | | Better label color validation, fixes #7454
| * | Do label validation for issues/merge requests APIRobert Schilling2014-08-143-4/+44
| | |
* | | diff unfoldskv2014-08-143-1/+17
| | |
* | | Fix repository archiveDmitriy Zaporozhets2014-08-131-9/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #6788 from CingleVue/masterDmitriy Zaporozhets2014-08-131-0/+2
|\ \ \ | |/ / |/| | Patched `MergeRequest` to return more data.
| * | Patched `MergeRequest` to return more data.mabdullah-cinglevue2014-08-011-1/+2
| | | | | | | | | | | | Added milestone to merge_requests instead of milestone id.
| * | # This is a combination of 2 commits.mabdullah-cinglevue2014-08-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # The first commit's message is: Patched `MergeRequest` to return more data. Patched `MergeRequest` to return the `description` & `milestone` Conflicts: lib/api/entities.rb # This is the 2nd commit message: Update merge_requests.md Update documentation for merge request endpoint adding support for description.
* | | Merge pull request #7441 from bbodenmiller/patch-7Dmitriy Zaporozhets2014-08-131-2/+4
|\ \ \ | | | | | | | | add git config --global core.autocrlf check
| * | | add git config --global core.autocrlf checkBen Bodenmiller2014-08-041-2/+4
| |/ / | | | | | | core.autocrlf was added to install guide in https://github.com/gitlabhq/gitlabhq/commit/2d681c0d1ed14bf23c041aa04fa3e77caceda9a1 but not added to check script
* | | Merge branch 'ldap/cache_check' into 'master'Dmitriy Zaporozhets2014-08-132-7/+15
|\ \ \ | |_|/ |/| | | | | | | | | | | Cache LDAP check everywhere See merge request !1008
| * | Cache LDAP check in Gitlab::UserAccessJacob Vosmaer2014-08-061-7/+2
| | | | | | | | | | | | | | | This changes the number of LDAP calls when users access GitLab via Git-over-SSH or the API. LDAP check results are cached for 1 hour.
| * | Move LDAP timeout code to Gitlab::LDAP::AccessJacob Vosmaer2014-08-061-0/+13
| | |
* | | Increase import timeout from 2 to 4 minutesDmitriy Zaporozhets2014-08-111-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Cleaner variable nameDmitriy Zaporozhets2014-08-111-3/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #7466 from Razer6/improve_markup_handlingDmitriy Zaporozhets2014-08-111-0/+25
|\ \ \ | | | | | | | | Improve readme markup, fixes #7455
| * | | Use readme we support to render if there are multiple readmesRobert Schilling2014-08-111-0/+25
| | | |
* | | | Merge branch 'add_complete_commit_message_to_api' of ↵Dmitriy Zaporozhets2014-08-111-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/christian.taedcke/gitlab-ce into christian.taedcke/gitlab-ce-add_complete_commit_message_to_api Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | | | Add full commit message to commit api as field message.Christian Taedcke2014-07-251-0/+1
| | | | |
* | | | | Merge branch 'master' into 'master'Dmitriy Zaporozhets2014-08-112-2/+14
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let users limit by archived/not archived projects in GitLab API GET /projects Adds a boolean parameter, archived, to the /projects endpoint. See merge request !158
| * | | | Add an option to GET /projects in the GitLab API to exclude archived projectsSasha Joseph2014-07-282-2/+14
| |/ / /
* | | | Merge branch 'improve-test-env' into 'master'Dmitriy Zaporozhets2014-08-092-7/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve test env * Replace big gitlabhq repo with small one (https://gitlab.com/gitlab-org/gitlab-test) * dont stub gitlab-shell calls Advantages: * test gitlab-shell install during tests * test integration with gitlab-shell features (fork, change default branch etc) * don't store archive with test repo inside gitlab * less stubs - easier to write/read tests During this refactoring __next issues are be fixed__: * satellite error if gitlab_shell path is relative * project rename repo -> 500 error * fixed wrong diff for MR `download plain diff` * fixed bug when gfm ignores `@ref` variable during link parsing Fixes #1451 See merge request !1005
| * | | | Fix satellite testsDmitriy Zaporozhets2014-08-061-6/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix markdown tests. Use new repo for testing. Fixed gitlab-shell test setupDmitriy Zaporozhets2014-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Get gitlab-shell verion from file for install rake taskDmitriy Zaporozhets2014-07-311-1/+2
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Simplify the ssl setup file.Sytse Sijbrandij2014-08-042-59/+30
|/ / /
* | | Fix old api compatibility and testsDmitriy Zaporozhets2014-07-303-7/+23
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix testsDmitriy Zaporozhets2014-07-301-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Refactor label rendering and default label set generationDmitriy Zaporozhets2014-07-291-19/+18
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Migrate issue/mr labels from act_as_taggable to own labelsDmitriy Zaporozhets2014-07-291-3/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Git::Compare does not have limit param any moreDmitriy Zaporozhets2014-07-293-6/+10
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Refactor compare logic for MR. Use satellites only for forks for better ↵Dmitriy Zaporozhets2014-07-292-16/+13
| | | | | | | | | | | | | | | | | | performance Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Override Gitlab::Git::Compare limitDmitriy Zaporozhets2014-07-291-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'satellite_compare_gitlab_git' into 'master'Dmitriy Zaporozhets2014-07-291-9/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | Use Gitlab::Git::Compare in Satellite::CompareAction See merge request !976
View Lorry Controller Status