| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-04-13 | 11 | -9/+386 |
| |\ | |||||
| | * | Merge branch 'api-move-issues' into 'master' | Rémy Coutable | 2016-04-13 | 1 | -0/+55 |
| | |\ | | | | | | | | | | | | | | | | | | | API: Ability to move an issue Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14741 See merge request !3593 | ||||
| | | * | Fix doc for moving an issue | Robert Schilling | 2016-04-13 | 1 | -1/+1 |
| | | | | |||||
| | | * | Update tests for moving issues via API | Robert Schilling | 2016-04-13 | 1 | -2/+6 |
| | | | | |||||
| | | * | API: Ability to move an issue | Robert Schilling | 2016-04-13 | 1 | -0/+51 |
| | | | | |||||
| | * | | Merge branch 'patch-2' into 'master' | Robert Schilling | 2016-04-13 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | improve formatting See merge request !3688 | ||||
| | | * | | improve formatting | Ben Bodenmiller | 2016-04-12 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'configure_trusted_proxies' into 'master' | Rémy Coutable | 2016-04-13 | 1 | -0/+10 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the default trusted_proxies to only include localhost And also allow other trusted proxies to be added from the config.yml. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3538 Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208 See merge request !3524 | ||||
| | | * | | | Updated trusted proxies doc section to link to the restart GitLab docsconfigure_trusted_proxies | DJ Mountney | 2016-04-12 | 1 | -1/+2 |
| | | | | | | |||||
| | | * | | | Add changelog entries, install docs, and gitlab.yml.example entry for the ↵ | DJ Mountney | 2016-04-12 | 1 | -0/+9 |
| | | |/ / | | | | | | | | | | | | | trusted_proxies setting | ||||
| | * | | | Tie example config to JIRA screenshot | Achilleas Pipinellis | 2016-04-13 | 2 | -5/+17 |
| | | |/ | |/| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203 | ||||
| | * | | Merge branch 'docs-new-branch-button-3886' into 'master' | Achilleas Pipinellis | 2016-04-13 | 2 | -0/+32 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs for the new branch button [ci-skip] Closes #3886 @axil Could you check this and make sure this is up to your standards? See merge request !3425 | ||||
| | | * | | Move 'New branch from issue' feature doc to web_editor.md | Achilleas Pipinellis | 2016-04-13 | 3 | -9/+32 |
| | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | | * | | Docs for the new branch buttondocs-new-branch-button-3886 | Zeger-Jan van de Weg | 2016-03-28 | 2 | -0/+9 |
| | | | | | | | | | | | | | | | | | [ci-skip] | ||||
| | * | | | Merge branch 'api-group-visibility' into 'master' | Rémy Coutable | 2016-04-13 | 1 | -0/+81 |
| | |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | API: Ability to update a group This makes it much easier to update a group after introducing the group visibility. * Closes #14991 See merge request !3587 | ||||
| | | * | | Fix minor issues according development guidelines | Robert Schilling | 2016-04-12 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | API: Ability to update a group | Robert Schilling | 2016-04-12 | 1 | -0/+81 |
| | | | | | |||||
| | * | | | Merge branch 'api-delete-note' into 'master' | Rémy Coutable | 2016-04-12 | 1 | -0/+141 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete notes via API Supports deleting issues, snippets, and merge requests via the API. * Closes #14944 * Closes #14845 * Closes #6060 @zj I did not see that you assigned yourself in #6060. Hopefully, you did not start yet. @rymai In #6060 this is targeted for 8.7 release. Could you review that and maybe this still lands in 8.7. See merge request !3557 | ||||
| | | * | | | Fix code review issues | Robert Schilling | 2016-04-12 | 1 | -17/+113 |
| | | | | | | |||||
| | | * | | | Delete notes via API | Robert Schilling | 2016-04-12 | 1 | -0/+45 |
| | | |/ / | |||||
| | * | | | Merge branch 'api-get-tag' into 'master' | Rémy Coutable | 2016-04-12 | 1 | -1/+45 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Ability to retrieve a single tag * Closes #14330 /cc @dblessing See merge request !3577 | ||||
| | | * | | | Fix minor styling issues from code review | Robert Schilling | 2016-04-12 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | API: Ability to retrieve a single tag | Robert Schilling | 2016-04-12 | 1 | -1/+45 |
| | | | | | | |||||
| | * | | | | Allow a project member to leave the projected through the APIremove-myself-from-project-api-7687 | Zeger-Jan van de Weg | 2016-04-12 | 1 | -2/+4 |
| | | |/ / | |/| | | |||||
| * | | | | (doc) fix typo to ssh keys doc url | Lee | 2016-04-12 | 1 | -4/+4 |
| |/ / / | |||||
| * | | | API: Expose updated_at for notes | Robert Schilling | 2016-04-12 | 1 | -0/+3 |
| |/ / | |||||
| * | | Merge branch 'api-labels-info' into 'master' | Rémy Coutable | 2016-04-12 | 1 | -20/+20 |
| |\ \ | | | | | | | | | | | | | | | | | | | API: Expose open_issues_count, closed_issues_count, open_merge_requests_count on labels Partly fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13238 See merge request !3569 | ||||
| | * | | API: Expose open_issues_count, closed_issues_count, ↵ | Robert Schilling | 2016-04-06 | 1 | -20/+20 |
| | | | | | | | | | | | | | open_merge_requests_count on labels | ||||
| * | | | Go back to gitlab-workhorse 0.7.1 | Jacob Vosmaer | 2016-04-11 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | We found out that 0.7.2 breaks shallow `git clone`. GitLab 8.7 will work fine with gitlab-workhorse 0.7.1 too. | ||||
| * | | | Merge branch 'metrics-measure-block-transaction' into 'master' | Yorick Peterse | 2016-04-11 | 1 | -19/+18 |
| |\ \ \ | | | | | | | | | | | | | | | | | Store block timings as transaction values See merge request !3649 | ||||
| | * | | | Track call counts in Gitlab::Metrics.measure_blockmetrics-measure-block-transaction | Yorick Peterse | 2016-04-11 | 1 | -3/+4 |
| | | | | | |||||
| | * | | | Store block timings as transaction values | Yorick Peterse | 2016-04-11 | 1 | -19/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to query, simplifies the code, and makes it possible to figure out what transaction the data belongs to (simply because it's now stored _in_ the transaction). This new setup keeps track of both the real/wall time _and_ CPU time spent in a block, both measured using milliseconds (to keep all units the same). | ||||
| * | | | | Merge branch 'rs-code-review-guide' into 'master' | Dmitriy Zaporozhets | 2016-04-11 | 2 | -0/+80 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First pass at a Code Review guide Largely borrowed from thoughtbot's code review guide, so attribution is included. [ci skip] See merge request !3639 | ||||
| | * | | | Re-add a note about sarcasm to the Code Review guiders-code-review-guide | Robert Speicher | 2016-04-10 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | First pass at a Code Review guide | Robert Speicher | 2016-04-09 | 2 | -0/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Largely borrowed from thoughtbot's code review guide, so attribution is included. [ci skip] | ||||
| * | | | | Merge branch 'patch-1' into 'master' | Achilleas Pipinellis | 2016-04-11 | 1 | -7/+6 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct documentation on enabling artifacts. The docs say to enable artifacts that settings should be set to "false". This updates the documents to change the setting to "true". See merge request !3630 | ||||
| | * | | | | fix typo | Benjamin Montgomery | 2016-04-10 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Make the purpose of artifact config options clearer | Benjamin Montgomery | 2016-04-10 | 1 | -9/+6 |
| | | | | | | |||||
| | * | | | | actually enable artifacts | Benjamin Montgomery | 2016-04-09 | 1 | -2/+2 |
| | |/ / / | |||||
| * | | | | Everything on one page.project-services-page-should-contain-full-info | Sytse Sijbrandij | 2016-04-09 | 2 | -15/+21 |
| |/ / / | |||||
| * | | | Minor Testing guide copyedits | Robert Speicher | 2016-04-09 | 1 | -8/+10 |
| | | | | | | | | | | | | | [ci skip] | ||||
| * | | | Merge branch 'remove-todo' into 'master' | Dmitriy Zaporozhets | 2016-04-08 | 1 | -4/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove TODO for not documented stuff We should not put a `TODO` in a released product. See merge request !3553 | ||||
| | * | | | Remove TODO for not documented stuff | Robert Schilling | 2016-04-05 | 1 | -4/+0 |
| | |/ / | |||||
| * | | | Merge branch 'rs-testing-guide' into 'master' | Dmitriy Zaporozhets | 2016-04-08 | 2 | -0/+135 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First pass at a Testing styleguide Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14121 [ci skip] See merge request !3465 | ||||
| | * | | | Add a link back to Development documentation to Testing guiders-testing-guide | Robert Speicher | 2016-04-01 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | Add a section about `let` to the Testing guide | Robert Speicher | 2016-04-01 | 1 | -4/+25 |
| | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | Factories don't have to be limited to `ActiveRecord` objects | Robert Speicher | 2016-04-01 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | Add a note about Four-Phase Test to Testing guide | Robert Speicher | 2016-04-01 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | First pass at a Testing styleguide | Robert Speicher | 2016-04-01 | 2 | -0/+106 |
| | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | Merge branch 'gitlab-workhorse-0.7.2' into 'master' | Yorick Peterse | 2016-04-08 | 2 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 0.7.2 See merge request !3570 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |