Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master' | Sean McGivern | 2017-06-29 | 2 | -0/+60 |
|\ | |||||
| * | Added code for defining SHA attributes | Yorick Peterse | 2017-06-29 | 2 | -0/+60 |
* | | Merge branch 'refactor-namespace-default-scope-override' into 'master' | Douwe Maan | 2017-06-29 | 1 | -0/+10 |
|\ \ | |||||
| * | | Remove Namespace model default scope override and write additional test to Pr...refactor-namespace-default-scope-override | Tiago Botelho | 2017-06-29 | 1 | -0/+10 |
* | | | Merge branch 'revert-12499' into 'master' | Douwe Maan | 2017-06-29 | 1 | -21/+0 |
|\ \ \ | |||||
| * | | | Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'" | Adam Niedzielski | 2017-06-29 | 1 | -21/+0 |
* | | | | Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master' | Kamil Trzciński | 2017-06-29 | 2 | -1/+8 |
|\ \ \ \ | |||||
| * | | | | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelines | Z.J. van de Weg | 2017-06-27 | 2 | -1/+8 |
* | | | | | Merge branch '26125-match-username-on-search' into 'master' | Douwe Maan | 2017-06-29 | 1 | -25/+32 |
|\ \ \ \ \ | |||||
| * | | | | | Inserts exact matches of username, email and name to the top of the user sear...26125-match-username-on-search | Tiago Botelho | 2017-06-29 | 1 | -25/+32 |
* | | | | | | Merge branch 'hb-fix-abuse-report-on-stale-user-profile' into 'master' | Douwe Maan | 2017-06-29 | 2 | -1/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix errors caused by attempts to report already blocked or deleted users | Horacio Bertorello | 2017-06-28 | 2 | -1/+26 |
* | | | | | | | Merge branch 'refactor/declarative-policy' into 'master' | Sean McGivern | 2017-06-29 | 12 | -277/+305 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | convert all the policies to DeclarativePolicy | http://jneen.net/ | 2017-06-27 | 2 | -3/+3 |
| * | | | | | | | update the specs to not require a set to be returned | http://jneen.net/ | 2017-06-27 | 12 | -275/+303 |
* | | | | | | | | Merge branch '33082-use-update_pipeline_schedule-for-edit-and-take_ownership-... | Douwe Maan | 2017-06-29 | 2 | -0/+137 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Make membership required for create_user_by_membership | Shinya Maeda | 2017-06-28 | 1 | -3/+3 |
| * | | | | | | | | Fix sa | Shinya Maeda | 2017-06-28 | 1 | -3/+1 |
| * | | | | | | | | use go instead of let proc | Shinya Maeda | 2017-06-28 | 2 | -49/+43 |
| * | | | | | | | | Fixed typo and hash alighment | Shinya Maeda | 2017-06-28 | 2 | -3/+5 |
| * | | | | | | | | Improve description_for | Shinya Maeda | 2017-06-28 | 1 | -2/+1 |
| * | | | | | | | | Fix static analysis | Shinya Maeda | 2017-06-28 | 1 | -1/+1 |
| * | | | | | | | | IMprove access_matchers | Shinya Maeda | 2017-06-28 | 2 | -26/+24 |
| * | | | | | | | | Remove author. Replace Result to Got. | Shinya Maeda | 2017-06-28 | 1 | -1/+1 |
| * | | | | | | | | Fix static analysys | Shinya Maeda | 2017-06-28 | 2 | -13/+13 |
| * | | | | | | | | Resolve static analysis | Shinya Maeda | 2017-06-28 | 1 | -2/+2 |
| * | | | | | | | | Add changelog. Add AccessMatchersForController | Shinya Maeda | 2017-06-28 | 2 | -0/+146 |
* | | | | | | | | | Merge branch 'add-members-count-and-parent-id-data-on-namespaces-api' into 'm... | Douwe Maan | 2017-06-29 | 4 | -2/+58 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add parent_id back to the tests | Oswaldo Ferreira | 2017-06-28 | 2 | -2/+4 |
| * | | | | | | | | | Improve tests text | Oswaldo Ferreira | 2017-06-28 | 1 | -2/+2 |
| * | | | | | | | | | Rename members_count to members_count_with_descendants and expose only to gro... | Oswaldo Ferreira | 2017-06-28 | 3 | -11/+26 |
| * | | | | | | | | | Adjust projects spec on namespace fields | Oswaldo Ferreira | 2017-06-28 | 2 | -2/+6 |
| * | | | | | | | | | Add "members_count" and "parent_id" data on namespaces API | Oswaldo Ferreira | 2017-06-28 | 2 | -0/+35 |
* | | | | | | | | | | Merge branch '34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_u... | Rémy Coutable | 2017-06-29 | 2 | -1/+48 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix a bug where an invalid sort param value was passed to Gitaly34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_updated | Alejandro Rodríguez | 2017-06-28 | 2 | -1/+48 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'dm-relative-submodule-url-trailing-whitespace' into 'master' | Rémy Coutable | 2017-06-29 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Strip trailing whitespace in relative submodule URLdm-relative-submodule-url-trailing-whitespace | Douwe Maan | 2017-06-28 | 1 | -0/+5 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'dm-merge-request-creations-controller' into 'master' | Sean McGivern | 2017-06-29 | 23 | -675/+740 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Split up MergeRequestsControllerdm-merge-request-creations-controller | Douwe Maan | 2017-06-28 | 23 | -675/+740 |
* | | | | | | | | | | Merge branch 'bvl-rename-all-reserved-paths' into 'master' | Sean McGivern | 2017-06-29 | 5 | -17/+241 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Adjust for new static-analysis failuresbvl-rename-all-reserved-paths-mysql | Bob Van Landuyt | 2017-06-27 | 1 | -6/+6 |
| * | | | | | | | | | Keep failed renames in redis | Bob Van Landuyt | 2017-06-26 | 1 | -0/+19 |
| * | | | | | | | | | Use the migration name as a key in redis | Bob Van Landuyt | 2017-06-26 | 2 | -1/+5 |
| * | | | | | | | | | Don't break rolling back when a namespace or project was renamed | Bob Van Landuyt | 2017-06-26 | 2 | -0/+14 |
| * | | | | | | | | | Revert renames from a migration | Bob Van Landuyt | 2017-06-26 | 1 | -0/+22 |
| * | | | | | | | | | Revert namespace renames | Bob Van Landuyt | 2017-06-26 | 3 | -16/+65 |
| * | | | | | | | | | Add methods to revert project renames | Bob Van Landuyt | 2017-06-26 | 2 | -16/+97 |
| * | | | | | | | | | Track all renames in redis | Bob Van Landuyt | 2017-06-26 | 4 | -0/+35 |
* | | | | | | | | | | Merge branch 'fix-34417' into 'master' | Sean McGivern | 2017-06-29 | 1 | -0/+34 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add tests for project import state transition: [:started] => [:finished]fix-34417 | Douglas Barbosa Alexandre | 2017-06-28 | 1 | -0/+34 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | |