summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'api-version' into 'master' Robert Speicher2016-10-122-0/+13
|\
| * API: Version informationapi-versionRobert Schilling2016-10-122-0/+13
* | Merge branch '17541-move-licenses-api-endpoint-to-templates-licenses' into 'm...Rémy Coutable2016-10-123-83/+100
|\ \ | |/ |/|
| * Create a new /templates API namespaceThomas Balthazar2016-10-123-83/+100
* | Merge branch 'user-events-api' into 'master' Robert Speicher2016-10-121-0/+20
|\ \ | |/ |/|
| * API: New /users/:id/events endpointRémy Coutable2016-10-101-0/+20
* | Merge branch 'api-fix-project-group-sharing' into 'security'Rémy Coutable2016-10-111-0/+6
* | Merge branch 'atom-routes' into 'master' Robert Speicher2016-10-111-2/+31
|\ \
| * | Allow browsing branches that end with '.atom'Sean McGivern2016-10-111-2/+31
| |/
* | Merge branch 'docs/refactor-reply-by-email' into 'master' Achilleas Pipinellis2016-10-111-3/+3
|\ \
| * | Move reply by email docs to a new locationdocs/refactor-reply-by-emailAchilleas Pipinellis2016-09-251-3/+3
* | | Add a new gitlab:users:clear_all_authentication_tokens taskRémy Coutable2016-10-111-0/+11
* | | Merge branch 'dz-cleanup-routing' into 'master' Dmitriy Zaporozhets2016-10-111-0/+4
|\ \ \
| * | | Replace undefined Grape routing code from 400 to 404Dmitriy Zaporozhets2016-10-101-1/+1
| * | | Catch any undefined API routing and return 400 Bad RequestDmitriy Zaporozhets2016-10-101-0/+4
| | |/ | |/|
* | | Merge branch 'fix-misnamed-constant' into 'master' Robert Speicher2016-10-102-2/+2
|\ \ \
| * | | HTMLEntityFilter -> HtmlEntityFilterNick Thomas2016-10-102-2/+2
* | | | Merge branch 'explain-0600' into 'master' Robert Speicher2016-10-101-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Explain the extra chmodJacob Vosmaer2016-09-261-1/+1
* | | | Correct namespace validation to forbid bad names #21077Will Starms2016-10-071-2/+2
| |/ / |/| |
* | | Merge branch 'memoize_shell_secret_token' into 'master' Rémy Coutable2016-10-073-17/+33
|\ \ \
| * | | Load Github::Shell's secret token from file on initialization instead of ever...Justin DiPierro2016-10-063-17/+33
* | | | Merge branch 'ben.boeckel/gitlab-ce-api-visible-projects' into 'master' Rémy Coutable2016-10-071-20/+31
|\ \ \ \
| * | | | Tidy up project list actionsben.boeckel/gitlab-ce-api-visible-projectsSean McGivern2016-10-051-28/+24
| * | | | api: add /projects/visible API endpointBen Boeckel2016-10-041-0/+15
* | | | | Merge branch '22820-api-use-env-not-request-in-helpers' into 'master' Rémy Coutable2016-10-071-1/+1
|\ \ \ \ \
| * | | | | Switch from request to env in ::API::HelpersNick Thomas2016-10-061-1/+1
| | |/ / / | |/| | |
* | | | | Enable CacheMarkdownField for the remaining modelsNick Thomas2016-10-072-0/+13
* | | | | Use CacheMarkdownField for notesNick Thomas2016-10-072-32/+26
* | | | | Add markdown cache columns to the database, but don't use them yetNick Thomas2016-10-073-16/+59
* | | | | Merge branch 'fix-already-selected-activity-link' into 'master' Fatih Acet2016-10-061-10/+13
|\ \ \ \ \
| * | | | | Fix inconsistent highlighting of already selected activity nav-linksClement Ho2016-10-051-10/+13
* | | | | | Make user constrainer lookup same as controller and add more constrainer testsDmitriy Zaporozhets2016-10-061-1/+1
* | | | | | Change user & group landing page routing from /u/:name & /groups/:name to /:nameDmitriy Zaporozhets2016-10-063-0/+27
| |/ / / / |/| | | |
* | | | | Merge branch 'fix/github-importer-client' into 'master' Rémy Coutable2016-10-061-2/+12
|\ \ \ \ \
| * | | | | Fix broken handling of certain calls in GitHub importer clientfix/github-importer-clientAhmad Sherif2016-10-061-2/+12
* | | | | | Merge branch 'rc-use-grape-dsl-to-document-members-api' into 'master' Robert Speicher2016-10-062-93/+67
|\ \ \ \ \ \
| * | | | | | Use Grape DSL to document methods and their paramsrc-use-grape-dsl-to-document-members-apiRémy Coutable2016-10-052-93/+67
* | | | | | | Merge branch 'mahcsig/gitlab-ce-17350-multi-file-commit'Rémy Coutable2016-10-061-0/+36
|\ \ \ \ \ \ \
| * | | | | | | multi-file commitMarc Siegfriedt2016-10-051-0/+36
* | | | | | | | Merge branch 'issue-board-api-support' into 'master' Dmitriy Zaporozhets2016-10-063-1/+133
|\ \ \ \ \ \ \ \
| * | | | | | | | Added Issue Board API supportAndre Guedes2016-10-053-1/+133
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Use higher size on Gitlab::Redis connection pool on Sidekiq serversPaco Guzman2016-10-061-1/+11
* | | | | | | | Merge remote-tracking branch 'dev/master'Rémy Coutable2016-10-063-5/+25
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fix/id-claim-import-issue' into 'master' Douwe Maan2016-09-303-5/+25
| |\ \ \ \ \ \ \ \
| | * | | | | | | | updated attribute cleaner to use allowed keyword and reject attributesJames Lopez2016-09-271-3/+3
| | * | | | | | | | Prevent claiming associated model IDs via import and added relevant specsJames Lopez2016-09-273-5/+25
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-068-8/+22
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | fix export project file permissions issueJames Lopez2016-09-307-7/+18
| * | | | | | | | Merge branch '22435-no-api-state-change-via-rails-session' into 'security' Douwe Maan2016-09-281-1/+4
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
View Lorry Controller Status