summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'add-members-count-and-parent-id-data-on-namespaces-api' into 'm...Douwe Maan2017-06-299-6/+90
|\
| * Improve changelogadd-members-count-and-parent-id-data-on-namespaces-apiOswaldo Ferreira2017-06-282-4/+4
| * Add parent_id back to the testsOswaldo Ferreira2017-06-282-2/+4
| * Improve tests textOswaldo Ferreira2017-06-282-3/+2
| * Rename members_count to members_count_with_descendants and expose only to gro...Oswaldo Ferreira2017-06-286-20/+39
| * Adjust projects spec on namespace fieldsOswaldo Ferreira2017-06-282-2/+6
| * Add "members_count" and "parent_id" data on namespaces APIOswaldo Ferreira2017-06-286-3/+63
* | Merge branch '34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_u...Rémy Coutable2017-06-293-1/+50
|\ \
| * | Fix a bug where an invalid sort param value was passed to Gitaly34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_updatedAlejandro Rodríguez2017-06-283-1/+50
| |/
* | Merge branch 'dm-page-image-size' into 'master'Rémy Coutable2017-06-292-0/+6
|\ \
| * | Limit OpenGraph image size to 64x64dm-page-image-sizeDouwe Maan2017-06-282-0/+6
| |/
* | Merge branch 'dm-relative-submodule-url-trailing-whitespace' into 'master'Rémy Coutable2017-06-293-0/+10
|\ \
| * | Strip trailing whitespace in relative submodule URLdm-relative-submodule-url-trailing-whitespaceDouwe Maan2017-06-283-0/+10
* | | Merge branch 'dm-merge-request-creations-controller' into 'master'Sean McGivern2017-06-2969-1247/+1341
|\ \ \
| * | | Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-2869-1247/+1341
* | | | Merge branch 'bvl-rename-all-reserved-paths' into 'master'Sean McGivern2017-06-2911-37/+497
|\ \ \ \
| * | | | Adjust for new static-analysis failuresbvl-rename-all-reserved-paths-mysqlBob Van Landuyt2017-06-272-8/+8
| * | | | Only do one query for updating routesBob Van Landuyt2017-06-271-5/+15
| * | | | Update routes directly by ID instead of filtering by pathBob Van Landuyt2017-06-261-4/+12
| * | | | Disable statement timeoutBob Van Landuyt2017-06-261-0/+4
| * | | | Clear the cache for projects one-by-oneBob Van Landuyt2017-06-261-14/+16
| * | | | Add changelogBob Van Landuyt2017-06-261-0/+4
| * | | | Add punctuation to log messagesBob Van Landuyt2017-06-263-4/+6
| * | | | Keep failed renames in redisBob Van Landuyt2017-06-262-1/+32
| * | | | Use the migration name as a key in redisBob Van Landuyt2017-06-263-2/+6
| * | | | Don't break rolling back when a namespace or project was renamedBob Van Landuyt2017-06-264-5/+21
| * | | | More logging so we know we have the rename in redisBob Van Landuyt2017-06-261-1/+5
| * | | | Revert renames from a migrationBob Van Landuyt2017-06-263-0/+28
| * | | | Revert namespace renamesBob Van Landuyt2017-06-265-17/+88
| * | | | Add methods to revert project renamesBob Van Landuyt2017-06-264-22/+146
| * | | | Track all renames in redisBob Van Landuyt2017-06-267-0/+44
| * | | | Rename each route individuallyBob Van Landuyt2017-06-261-3/+3
| * | | | Rename all forbidden paths againBob Van Landuyt2017-06-261-0/+108
* | | | | Merge branch '34039-scroll-job' into 'master'Phil Hughes2017-06-292-4/+8
|\ \ \ \ \
| * | | | | Job details won't scroll horizontally to show long linesFilipa Lacerda2017-06-292-4/+8
|/ / / / /
* | | | | Merge branch 'fix-34417' into 'master'Sean McGivern2017-06-293-17/+48
|\ \ \ \ \
| * | | | | Add tests for project import state transition: [:started] => [:finished]fix-34417Douglas Barbosa Alexandre2017-06-281-0/+34
| * | | | | Add CHANGELOGDouglas Barbosa Alexandre2017-06-281-0/+4
| * | | | | Perform housekeeping only when an import of a fresh project is completedDouglas Barbosa Alexandre2017-06-281-17/+10
* | | | | | Merge branch 'postreceive-gl-repository' into 'master'Sean McGivern2017-06-292-43/+16
|\ \ \ \ \ \
| * | | | | | Use gl_repository exclusively as identifier on post-receivepostreceive-gl-repositoryAlejandro Rodríguez2017-06-272-43/+16
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'feature/sm/34314-add-hasvariable-concern' into 'master'Kamil Trzciński2017-06-294-56/+69
|\ \ \ \ \ \
| * | | | | | Improve small thingsfeature/sm/34314-add-hasvariable-concernShinya Maeda2017-06-282-4/+2
| * | | | | | Remove PoC specShinya Maeda2017-06-281-34/+0
| * | | | | | Add a test for checking validates :key does not override by concernShinya Maeda2017-06-281-0/+34
| * | | | | | DecuplinShinya Maeda2017-06-284-56/+71
* | | | | | | Merge branch 'docs/pat-expiration-date' into 'master'Marcia Ramos2017-06-291-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Clarify the expiration date of PATsdocs/pat-expiration-dateAchilleas Pipinellis2017-06-211-0/+3
* | | | | | | | Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master'Douwe Maan2017-06-2915-40/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Removes redundant pending delete checks30708-stop-using-deleted-at-to-filter-namespacesTiago Botelho2017-06-286-27/+10
View Lorry Controller Status