summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'Sean McGivern2017-06-292-0/+60
|\
| * Added code for defining SHA attributesYorick Peterse2017-06-292-0/+60
* | Merge branch 'refactor-namespace-default-scope-override' into 'master'Douwe Maan2017-06-291-0/+10
|\ \
| * | Remove Namespace model default scope override and write additional test to Pr...refactor-namespace-default-scope-overrideTiago Botelho2017-06-291-0/+10
* | | Merge branch 'revert-12499' into 'master'Douwe Maan2017-06-291-21/+0
|\ \ \
| * | | Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"Adam Niedzielski2017-06-291-21/+0
* | | | Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'Kamil Trzciński2017-06-292-1/+8
|\ \ \ \
| * | | | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelinesZ.J. van de Weg2017-06-272-1/+8
* | | | | Merge branch '26125-match-username-on-search' into 'master'Douwe Maan2017-06-291-25/+32
|\ \ \ \ \
| * | | | | Inserts exact matches of username, email and name to the top of the user sear...26125-match-username-on-searchTiago Botelho2017-06-291-25/+32
* | | | | | Merge branch 'hb-fix-abuse-report-on-stale-user-profile' into 'master'Douwe Maan2017-06-292-1/+26
|\ \ \ \ \ \
| * | | | | | Fix errors caused by attempts to report already blocked or deleted usersHoracio Bertorello2017-06-282-1/+26
* | | | | | | Merge branch 'refactor/declarative-policy' into 'master'Sean McGivern2017-06-2912-277/+305
|\ \ \ \ \ \ \
| * | | | | | | convert all the policies to DeclarativePolicyhttp://jneen.net/2017-06-272-3/+3
| * | | | | | | update the specs to not require a set to be returnedhttp://jneen.net/2017-06-2712-275/+303
* | | | | | | | Merge branch '33082-use-update_pipeline_schedule-for-edit-and-take_ownership-...Douwe Maan2017-06-292-0/+137
|\ \ \ \ \ \ \ \
| * | | | | | | | Make membership required for create_user_by_membershipShinya Maeda2017-06-281-3/+3
| * | | | | | | | Fix saShinya Maeda2017-06-281-3/+1
| * | | | | | | | use go instead of let procShinya Maeda2017-06-282-49/+43
| * | | | | | | | Fixed typo and hash alighmentShinya Maeda2017-06-282-3/+5
| * | | | | | | | Improve description_forShinya Maeda2017-06-281-2/+1
| * | | | | | | | Fix static analysisShinya Maeda2017-06-281-1/+1
| * | | | | | | | IMprove access_matchersShinya Maeda2017-06-282-26/+24
| * | | | | | | | Remove author. Replace Result to Got.Shinya Maeda2017-06-281-1/+1
| * | | | | | | | Fix static analysysShinya Maeda2017-06-282-13/+13
| * | | | | | | | Resolve static analysisShinya Maeda2017-06-281-2/+2
| * | | | | | | | Add changelog. Add AccessMatchersForControllerShinya Maeda2017-06-282-0/+146
* | | | | | | | | Merge branch 'add-members-count-and-parent-id-data-on-namespaces-api' into 'm...Douwe Maan2017-06-294-2/+58
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add parent_id back to the testsOswaldo Ferreira2017-06-282-2/+4
| * | | | | | | | | Improve tests textOswaldo Ferreira2017-06-281-2/+2
| * | | | | | | | | Rename members_count to members_count_with_descendants and expose only to gro...Oswaldo Ferreira2017-06-283-11/+26
| * | | | | | | | | Adjust projects spec on namespace fieldsOswaldo Ferreira2017-06-282-2/+6
| * | | | | | | | | Add "members_count" and "parent_id" data on namespaces APIOswaldo Ferreira2017-06-282-0/+35
* | | | | | | | | | Merge branch '34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_u...Rémy Coutable2017-06-292-1/+48
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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-282-1/+48
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'dm-relative-submodule-url-trailing-whitespace' into 'master'Rémy Coutable2017-06-291-0/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Strip trailing whitespace in relative submodule URLdm-relative-submodule-url-trailing-whitespaceDouwe Maan2017-06-281-0/+5
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'dm-merge-request-creations-controller' into 'master'Sean McGivern2017-06-2923-675/+740
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-2823-675/+740
* | | | | | | | | | Merge branch 'bvl-rename-all-reserved-paths' into 'master'Sean McGivern2017-06-295-17/+241
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Adjust for new static-analysis failuresbvl-rename-all-reserved-paths-mysqlBob Van Landuyt2017-06-271-6/+6
| * | | | | | | | | Keep failed renames in redisBob Van Landuyt2017-06-261-0/+19
| * | | | | | | | | Use the migration name as a key in redisBob Van Landuyt2017-06-262-1/+5
| * | | | | | | | | Don't break rolling back when a namespace or project was renamedBob Van Landuyt2017-06-262-0/+14
| * | | | | | | | | Revert renames from a migrationBob Van Landuyt2017-06-261-0/+22
| * | | | | | | | | Revert namespace renamesBob Van Landuyt2017-06-263-16/+65
| * | | | | | | | | Add methods to revert project renamesBob Van Landuyt2017-06-262-16/+97
| * | | | | | | | | Track all renames in redisBob Van Landuyt2017-06-264-0/+35
* | | | | | | | | | Merge branch 'fix-34417' into 'master'Sean McGivern2017-06-291-0/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add tests for project import state transition: [:started] => [:finished]fix-34417Douglas Barbosa Alexandre2017-06-281-0/+34
| | |_|_|_|_|/ / / / | |/| | | | | | | |