summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'refactor.notification-recipient-builders' into 'master'Sean McGivern2017-08-041-4/+10
|\
| * declarative_policy rubocop fixhttp://jneen.net/2017-08-031-2/+3
| * short-circuit if there is no policy, and add :read_project checkhttp://jneen.net/2017-08-031-4/+9
* | Don't bother going through an entire Banzai pipeline for empty textrs-minor-banzai-perfRobert Speicher2017-08-031-0/+2
* | Merge branch 'tc-no-todo-service-select-mysql' into 'master'Sean McGivern2017-08-032-6/+6
|\ \ | |/ |/|
| * Avoid plucking Todo ids and use sub-queries insteadToon Claes2017-08-032-6/+6
* | Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master'Robert Speicher2017-08-032-11/+27
|\ \
| * | Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitalyAhmad Sherif2017-08-022-11/+27
* | | Merge branch 'merge-request-commits-background-migration' into 'master'Rémy Coutable2017-08-031-0/+107
|\ \ \ | |_|/ |/| |
| * | Migrate MR commits and diffs to new tablesmerge-request-commits-background-migrationSean McGivern2017-08-031-0/+107
* | | Merge branch '28472-ignore-auto-generated-mails' into 'master'Sean McGivern2017-08-032-1/+13
|\ \ \
| * | | Check against "Auto-Submitted: no" insteadLin Jen-Shin2017-08-031-2/+11
| * | | Don't send rejection mails for all auto-generated mails28472-ignore-auto-generated-mailsLin Jen-Shin2017-08-032-1/+4
* | | | Merge branch 'fix-gitaly-install' into 'master'Rémy Coutable2017-08-031-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Ensure we run installation Rake tasks in a clean env in TestEnvRémy Coutable2017-08-021-1/+1
* | | | Merge branch 'dm-api-current-user' into 'master'Sean McGivern2017-08-032-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Do not validate CSRF token in API unless neededdm-api-current-userDouwe Maan2017-08-022-1/+3
* | | | Merge branch 'handle-reserved-words-for-oauth-usernames' into 'master'Rémy Coutable2017-08-021-2/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Uniquify reserved word usernames on OAuth user creationRobin Bobbitt2017-08-021-2/+7
* | | | Merge branch 'api_project_events_target_iid' into 'master'Rémy Coutable2017-08-021-1/+1
|\ \ \ \
| * | | | Expose target_iid in Events APIsue4452017-08-021-1/+1
* | | | | Extending API for protected branchesEric2017-08-024-3/+104
* | | | | Merge branch 'rugged-is-ancestor' into 'master'Sean McGivern2017-08-021-0/+7
|\ \ \ \ \
| * | | | | Add rugged_is_ancestor methodJacob Vosmaer2017-08-011-0/+7
| | |_|_|/ | |/| | |
* | | | | Merge branch 'pawel/add_more_variables_to_additional_metrics-35267' into 'mas...Douwe Maan2017-08-023-21/+28
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove default arguments for common query contextpawel/add_more_variables_to_additional_metrics-35267Pawel Chojnacki2017-08-012-2/+4
| * | | | Move timeframe_start and timeframe_end to common query contextPawel Chojnacki2017-08-013-14/+8
| * | | | Give metric query context rspec examples correctly sounding names. + missing ...Pawel Chojnacki2017-08-011-0/+1
| * | | | Context handling and tests cleanup + simple test kube_namespace context testPawel Chojnacki2017-07-311-11/+9
| * | | | add kube_namespace and standardize common variables for additional metrics qu...Pawel Chojnacki2017-07-313-12/+24
* | | | | Merge branch 'fix/sm/35825-api-specs-and-linting-failing-on-master' into 'mas...Rémy Coutable2017-08-012-4/+1
|\ \ \ \ \
| * | | | | Add 204. Remove duplicated method.fix/sm/35825-api-specs-and-linting-failing-on-masterShinya Maeda2017-08-012-4/+1
* | | | | | Merge branch 'rc/fetch-before-finding-merge-base-in-ee_compat_check' into 'ma...Sean McGivern2017-08-011-2/+0
|\ \ \ \ \ \
| * | | | | | Always fetch branches before finding the merge base, otherwise we could find ...rc/fetch-before-finding-merge-base-in-ee_compat_checkRémy Coutable2017-08-011-2/+0
| |/ / / / /
* | | | | | Merge branch '28283-legacy-storage-format' into 'master'Sean McGivern2017-08-0116-27/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Rename ensure_dir_exist -> ensure_storage_path_existGabriel Mazetto2017-08-011-1/+1
| * | | | | Added some extra TODOs for the Legacy Storage refactorGabriel Mazetto2017-08-011-0/+1
| * | | | | Rename more path_with_namespace -> full_path or disk_pathGabriel Mazetto2017-08-017-10/+10
| * | | | | Rename path_with_namespace -> disk_path when dealing with the filesystemGabriel Mazetto2017-08-012-3/+3
| * | | | | Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-019-14/+14
* | | | | | Merge branch 'gitaly-commit-languages' into 'master'Sean McGivern2017-08-013-3/+43
|\ \ \ \ \ \
| * | | | | | Add option to use CommitLanguages RPCJacob Vosmaer2017-08-012-0/+34
| * | | | | | CI fixes for gitaly-rubyJacob Vosmaer2017-08-011-3/+9
* | | | | | | Merge branch 'remove-content-commit' into 'master'Douwe Maan2017-08-011-18/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove unused (?) codeJacob Vosmaer2017-07-311-18/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'patch-25' into 'master'Rémy Coutable2017-08-011-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Invalid variableSemen Romanov2017-08-011-3/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '34519-extend-api-group-secret-variable' into 'master'Kamil Trzciński2017-08-013-0/+100
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | IniShinya Maeda2017-07-193-0/+100
* | | | | | | Merge branch 'mk-fix-wiki-backup' into 'master'Douwe Maan2017-07-311-0/+1
|\ \ \ \ \ \ \