summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'backport-5986-license-templates' into 'master'Robert Speicher2018-08-154-37/+21
|\
| * Convert the license template API to use the new LicenseTemplateFinderNick Thomas2018-08-152-31/+15
| * Fix bugs in Gitlab::Template::Finders preventing instances from BaseTemplate....Nick Thomas2018-08-142-6/+6
* | Merge branch 'bvl-add-czech' into 'master'Sean McGivern2018-08-151-1/+2
|\ \ | |/ |/|
| * Add Czech as an available languageBob Van Landuyt2018-08-151-1/+2
* | Merge branch 'expose-all-artifacts-sizes-in-jobs-api' into 'master'Kamil Trzciński2018-08-142-2/+8
|\ \
| * | Expose all artifacts sizes in jobs apiPeter Marko2018-08-142-2/+8
| |/
* | Merge branch 'ee-5863-customize-notifications-for-new-epic' into 'master'Grzegorz Bizon2018-08-142-4/+6
|\ \
| * | Allow global event list containing all eventsMark Chao2018-08-141-2/+4
| * | Add email_events to replace EMAIL_EVENTS because it needs to be dynamic,Mark Chao2018-08-142-3/+3
* | | Merge branch 'zj-remove-feature-gate-list-commits' into 'master'Douwe Maan2018-08-141-11/+2
|\ \ \
| * | | Remove feature gate for ListNewCommitsZeger-Jan van de Weg2018-08-141-11/+2
| | |/ | |/|
* | | Merge branch 'gitaly-install-path' into 'master'Douwe Maan2018-08-142-25/+12
|\ \ \
| * | | Remove storage path dependency of gitaly install taskAlejandro Rodríguez2018-08-122-25/+12
* | | | Merge branch '48967-disable-statement-timeout' into 'master'Douwe Maan2018-08-141-30/+73
|\ \ \ \ | |_|_|/ |/| | |
| * | | disable_statement_timeout doesn't require any argument anymoreGabriel Mazetto2018-08-111-27/+26
| * | | MigrationHelper `disable_statement_timeout` accepts `transaction: false`Gabriel Mazetto2018-08-101-31/+75
| | |/ | |/|
* | | Get the `merge-base` of 2 refs trough the APIBob Van Landuyt2018-08-133-3/+82
|/ /
* | Merge branch 'add-frozen-string-literal-to-community-contribution-files' into...Robert Speicher2018-08-102-0/+4
|\ \
| * | Add frozen_string_literal to recently-added files from the communitySean McGivern2018-08-102-0/+4
* | | CE Port of Protected Environments backendMayra Cabrera2018-08-101-1/+5
|/ /
* | Merge branch '28930-add-project-reference-filter' into 'master'Sean McGivern2018-08-103-0/+144
|\ \
| * | Use a hash to memoize readable_project_ids with user objects as keysReuben Pereira2018-07-311-6/+5
| * | Remove nodes_visible_to_user from ProjectParser and memoize readable_project_idsReuben Pereira2018-07-151-17/+10
| * | Use map instead of collect in the ProjectParser#projects_readable_by_user fun...Reuben Pereira2018-07-051-1/+1
| * | Add back the Project#to_reference_with_postfix function since it can be used ...Reuben Pereira2018-07-051-1/+1
| * | Use a custom ProjectParser#nodes_visible_to_user function so that the user pe...Reuben Pereira2018-07-051-2/+21
| * | Correct the comment above the ProjectReferenceFilter.references_in method.Reuben Pereira2018-07-031-1/+1
| * | Eager load a project's route and its namespace with route in project_referenc...Reuben Pereira2018-07-031-1/+1
| * | Eager load the namespace and route of a project in project_reference_filter.rbReuben Pereira2018-07-031-1/+2
| * | Correct the comments above the ProjectReferenceFilter#project_link_filter fun...Reuben Pereira2018-07-031-2/+2
| * | Correct the misleading name of a variable in ProjectReferenceFilter.project_l...Reuben Pereira2018-07-031-3/+3
| * | Correct the comment above the projects_hash function in the project_reference...Reuben Pereira2018-06-301-3/+3
| * | A working implementation of a project reference filter which links project re...Reuben Pereira2018-06-303-0/+132
* | | Backport of gitlab-org/gitlab-ee!6848Rubén Dávila2018-08-081-1/+1
* | | Merge branch 'sh-fix-bitbucket-cloud-importer-replies' into 'master'Robert Speicher2018-08-081-10/+13
|\ \ \
| * | | Fix Bitbucket Cloud importer omitting repliesStan Hu2018-08-071-10/+13
* | | | Backport issue board milestone lists EE changesOswaldo Ferreira2018-08-073-9/+19
* | | | Merge branch 'todos-visibility-migration' into 'master'Sean McGivern2018-08-071-0/+105
|\ \ \ \
| * | | | Remove todos of users without access to targets migrationJarka Kadlecová2018-08-071-0/+105
* | | | | Create Web IDE MR and branch pickerPaul Slaughter2018-08-071-0/+1
|/ / / /
* | | | Merge branch '46535-orphaned-uploads' into 'master'Kamil Trzciński2018-08-072-0/+90
|\ \ \ \ | |/ / / |/| | |
| * | | Clean orphaned files in object storageJarka Kadlecová2018-08-072-0/+90
* | | | Resolve "Mutual SSL Auth For Helm TIller"Mayra Cabrera2018-08-077-38/+138
* | | | Merge branch 'group-todos' into 'master'Sean McGivern2018-08-071-4/+9
|\ \ \ \
| * | | | Revert "Revert "Merge branch 'ee-5481-epic-todos' into 'master'""Jarka Kadlecová2018-08-021-4/+9
* | | | | Backport some changes from gitlab-org/gitlab-ee!6767Rubén Dávila2018-08-073-3/+30
* | | | | Merge branch 'sh-support-bitbucket-server-import' into 'master'Tim Zallmann2018-08-0614-9/+1152
|\ \ \ \ \
| * | | | | Remove date from author line since that is already present in `created_at`Stan Hu2018-08-031-1/+1
| * | | | | Add a comment when user can't be identifiedStan Hu2018-08-021-2/+10