summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'adam-external-issue-references-spike' into 'master'Sean McGivern2017-06-309-59/+45
|\
| * Improve support for external issue referencesadam-external-issue-references-spikeAdam Niedzielski2017-06-309-59/+45
* | Remove placeholder note when award emoji slash command is appliedKushal Pandya2017-06-301-0/+45
|/
* Merge branch '34502-gitlab-git-hook-should-set-the-gl_repository-environment-...Dmitriy Zaporozhets2017-06-305-26/+38
|\
| * Set the GL_REPOSITORY env variable on Gitlab::Git::Hook34502-gitlab-git-hook-should-set-the-gl_repository-environment-variableAlejandro Rodríguez2017-06-295-26/+38
* | Merge branch 'inject-add-diff-note' into 'master'Phil Hughes2017-06-301-1/+1
|\ \
| * | Render add-diff-note button with server.Bryce Johnson2017-06-291-1/+1
* | | Merge branch 'fix-sidebar-showing-mobile-merge-requests' into 'master'Tim Zallmann2017-06-303-14/+39
|\ \ \ | |_|/ |/| |
| * | Refactored tests and added a breakpoint to the merge_request_tabsfix-sidebar-showing-mobile-merge-requestsJose Ivan Vargas2017-06-293-17/+39
| * | Fixed sidebar not collapsing on merge request in mobile screensJose Ivan Vargas2017-06-271-2/+5
* | | Merge branch 'sh-fix-project-destroy-in-namespace' into 'master'Robert Speicher2017-06-292-20/+43
|\ \ \
| * | | Defer project destroys within a namespace in Groups::DestroyService#async_exe...Stan Hu2017-06-292-20/+43
* | | | Clean up issuable listsTaurie Davis2017-06-291-1/+1
| |_|/ |/| |
* | | Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' into...Robert Speicher2017-06-292-22/+175
|\ \ \ | |/ / |/| |
| * | Rename flipper_group to feature_group34078-allow-to-enable-feature-flags-with-more-granularityRémy Coutable2017-06-281-6/+6
| * | Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually ...Rémy Coutable2017-06-272-14/+19
| * | Allow the feature flags to be enabled/disabled with more granularityRémy Coutable2017-06-272-22/+170
* | | 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