summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ce-to-ee-merge-check-rake-task' into 'master' Robert Speicher2016-10-132-0/+111
|\
| * Improve the branch existence and merge checksce-to-ee-merge-check-rake-taskRémy Coutable2016-10-132-14/+23
| * Draft a quick CE->EE merge check rake taskRémy Coutable2016-10-132-0/+102
* | Merge branch 'api-order-mounts' into 'master' Rémy Coutable2016-10-131-4/+4
|\ \
| * | Sort API mountsapi-order-mountsRobert Schilling2016-10-131-4/+4
* | | Merge branch '22591-Convert-UTF-8-Emoji-to-Gitlab-emoji' into 'master' Rémy Coutable2016-10-132-7/+56
|\ \ \ | |_|/ |/| |
| * | Convert UTF-8 Emoji to Gitlab emojiJohan H2016-10-132-20/+26
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-cehenrik2016-10-126-85/+157
| |\ \
| * \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-cehenrik2016-10-111-3/+3
| |\ \ \
| * | | | Convert unicode emojis to images.henrik2016-10-112-9/+52
* | | | | Merge branch 'feature/issues-board' into 'master' Sean McGivern2016-10-131-14/+17
|\ \ \ \ \
| * | | | | Update Issue Board API to handle with has_many associationDouglas Barbosa Alexandre2016-10-111-14/+17
| | |/ / / | |/| | |
* | | | | Merge branch 'zj-grapedsl-variable' into 'master' Rémy Coutable2016-10-131-47/+42
|\ \ \ \ \
| * | | | | GrapeDSL for variableszj-grapedsl-variableZ.J. van de Weg2016-10-131-47/+42
| | |_|/ / | |/| | |
* | | | | 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
View Lorry Controller Status