Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'docs/refactor-reply-by-email' into 'master' | Achilleas Pipinellis | 2016-10-11 | 1 | -3/+3 |
|\ | |||||
| * | Move reply by email docs to a new locationdocs/refactor-reply-by-email | Achilleas Pipinellis | 2016-09-25 | 1 | -3/+3 |
* | | Add a new gitlab:users:clear_all_authentication_tokens task | Rémy Coutable | 2016-10-11 | 1 | -0/+11 |
* | | Merge branch 'dz-cleanup-routing' into 'master' | Dmitriy Zaporozhets | 2016-10-11 | 1 | -0/+4 |
|\ \ | |||||
| * | | Replace undefined Grape routing code from 400 to 404 | Dmitriy Zaporozhets | 2016-10-10 | 1 | -1/+1 |
| * | | Catch any undefined API routing and return 400 Bad Request | Dmitriy Zaporozhets | 2016-10-10 | 1 | -0/+4 |
* | | | Merge branch 'fix-misnamed-constant' into 'master' | Robert Speicher | 2016-10-10 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | HTMLEntityFilter -> HtmlEntityFilter | Nick Thomas | 2016-10-10 | 2 | -2/+2 |
* | | | | Merge branch 'explain-0600' into 'master' | Robert Speicher | 2016-10-10 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Explain the extra chmod | Jacob Vosmaer | 2016-09-26 | 1 | -1/+1 |
* | | | | Correct namespace validation to forbid bad names #21077 | Will Starms | 2016-10-07 | 1 | -2/+2 |
| |/ / |/| | | |||||
* | | | Merge branch 'memoize_shell_secret_token' into 'master' | Rémy Coutable | 2016-10-07 | 3 | -17/+33 |
|\ \ \ | |||||
| * | | | Load Github::Shell's secret token from file on initialization instead of ever... | Justin DiPierro | 2016-10-06 | 3 | -17/+33 |
* | | | | Merge branch 'ben.boeckel/gitlab-ce-api-visible-projects' into 'master' | Rémy Coutable | 2016-10-07 | 1 | -20/+31 |
|\ \ \ \ | |||||
| * | | | | Tidy up project list actionsben.boeckel/gitlab-ce-api-visible-projects | Sean McGivern | 2016-10-05 | 1 | -28/+24 |
| * | | | | api: add /projects/visible API endpoint | Ben Boeckel | 2016-10-04 | 1 | -0/+15 |
* | | | | | Merge branch '22820-api-use-env-not-request-in-helpers' into 'master' | Rémy Coutable | 2016-10-07 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Switch from request to env in ::API::Helpers | Nick Thomas | 2016-10-06 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Enable CacheMarkdownField for the remaining models | Nick Thomas | 2016-10-07 | 2 | -0/+13 |
* | | | | | Use CacheMarkdownField for notes | Nick Thomas | 2016-10-07 | 2 | -32/+26 |
* | | | | | Add markdown cache columns to the database, but don't use them yet | Nick Thomas | 2016-10-07 | 3 | -16/+59 |
* | | | | | Merge branch 'fix-already-selected-activity-link' into 'master' | Fatih Acet | 2016-10-06 | 1 | -10/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Fix inconsistent highlighting of already selected activity nav-links | Clement Ho | 2016-10-05 | 1 | -10/+13 |
* | | | | | | Make user constrainer lookup same as controller and add more constrainer tests | Dmitriy Zaporozhets | 2016-10-06 | 1 | -1/+1 |
* | | | | | | Change user & group landing page routing from /u/:name & /groups/:name to /:name | Dmitriy Zaporozhets | 2016-10-06 | 3 | -0/+27 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'fix/github-importer-client' into 'master' | Rémy Coutable | 2016-10-06 | 1 | -2/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Fix broken handling of certain calls in GitHub importer clientfix/github-importer-client | Ahmad Sherif | 2016-10-06 | 1 | -2/+12 |
* | | | | | | Merge branch 'rc-use-grape-dsl-to-document-members-api' into 'master' | Robert Speicher | 2016-10-06 | 2 | -93/+67 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use Grape DSL to document methods and their paramsrc-use-grape-dsl-to-document-members-api | Rémy Coutable | 2016-10-05 | 2 | -93/+67 |
* | | | | | | | Merge branch 'mahcsig/gitlab-ce-17350-multi-file-commit' | Rémy Coutable | 2016-10-06 | 1 | -0/+36 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | multi-file commit | Marc Siegfriedt | 2016-10-05 | 1 | -0/+36 |
* | | | | | | | | Merge branch 'issue-board-api-support' into 'master' | Dmitriy Zaporozhets | 2016-10-06 | 3 | -1/+133 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Added Issue Board API support | Andre Guedes | 2016-10-05 | 3 | -1/+133 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Use higher size on Gitlab::Redis connection pool on Sidekiq servers | Paco Guzman | 2016-10-06 | 1 | -1/+11 |
* | | | | | | | | Merge remote-tracking branch 'dev/master' | Rémy Coutable | 2016-10-06 | 3 | -5/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'fix/id-claim-import-issue' into 'master' | Douwe Maan | 2016-09-30 | 3 | -5/+25 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | updated attribute cleaner to use allowed keyword and reject attributes | James Lopez | 2016-09-27 | 1 | -3/+3 |
| | * | | | | | | | | Prevent claiming associated model IDs via import and added relevant specs | James Lopez | 2016-09-27 | 3 | -5/+25 |
| | | |_|_|_|_|/ / | | |/| | | | | | | |||||
* | | | | | | | | | Merge commit 'dev/security' into 'master' | Rémy Coutable | 2016-10-06 | 8 | -8/+22 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | fix export project file permissions issue | James Lopez | 2016-09-30 | 7 | -7/+18 |
| * | | | | | | | | Merge branch '22435-no-api-state-change-via-rails-session' into 'security' | Douwe Maan | 2016-09-28 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | API: disable rails session auth for non-GET/HEAD requests | Nick Thomas | 2016-09-23 | 1 | -1/+4 |
* | | | | | | | | | Merge branch 'fix_group_links_404' into 'master' | Fatih Acet | 2016-10-05 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | fix group links 404 | barthc | 2016-10-05 | 1 | -0/+3 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'kradydal/gitlab-ce-20989-disable-all-for-non-project-members' | Rémy Coutable | 2016-10-05 | 1 | -5/+9 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Fix test, add author attribute to all tests | Katarzyna Kobierska | 2016-10-03 | 1 | -2/+2 |
| * | | | | | | | Prevent rendering the link when the author has no access | Katarzyna Kobierska | 2016-10-03 | 1 | -5/+9 |
* | | | | | | | | Merge branch 'test-improve-gitlab-identifier' into 'master' | Rémy Coutable | 2016-10-05 | 1 | -8/+50 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Refactor Gitlab::Identifier | Yorick Peterse | 2016-10-05 | 1 | -8/+50 |
* | | | | | | | | | Merge branch 'update-runner-information' into 'master' | Rémy Coutable | 2016-10-05 | 2 | -16/+19 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | |