| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'handle-reserved-words-for-oauth-usernames' into 'master' | Rémy Coutable | 2017-08-02 | 1 | -2/+7 |
| |\ | | | | | | | | | Uniquify reserved word usernames on OAuth user creation See merge request !13244 | ||||
| | * | Uniquify reserved word usernames on OAuth user creation | Robin Bobbitt | 2017-08-02 | 1 | -2/+7 |
| | | | |||||
| * | | Merge branch 'api_project_events_target_iid' into 'master' | Rémy Coutable | 2017-08-02 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | Expose target_iid in Events API See merge request !13247 | ||||
| | * | | Expose target_iid in Events API | sue445 | 2017-08-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Extending API for protected branches | Eric | 2017-08-02 | 4 | -3/+104 |
| | | | | |||||
| * | | | Merge branch 'rugged-is-ancestor' into 'master' | Sean McGivern | 2017-08-02 | 1 | -0/+7 |
| |\ \ \ | | | | | | | | | | | | | | | | | Add rugged_is_ancestor method See merge request !13232 | ||||
| | * | | | Add rugged_is_ancestor method | Jacob Vosmaer | 2017-08-01 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Merge branch 'pawel/add_more_variables_to_additional_metrics-35267' into ↵ | Douwe Maan | 2017-08-02 | 3 | -21/+28 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | 'master' Add kube_namespace and standardize common variables for additional metrics queries See merge request !13169 | ||||
| | * | | | Remove default arguments for common query contextpawel/add_more_variables_to_additional_metrics-35267 | Pawel Chojnacki | 2017-08-01 | 2 | -2/+4 |
| | | | | | |||||
| | * | | | Move timeframe_start and timeframe_end to common query context | Pawel Chojnacki | 2017-08-01 | 3 | -14/+8 |
| | | | | | |||||
| | * | | | Give metric query context rspec examples correctly sounding names. + missing ↵ | Pawel Chojnacki | 2017-08-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | whitespace | ||||
| | * | | | Context handling and tests cleanup + simple test kube_namespace context test | Pawel Chojnacki | 2017-07-31 | 1 | -11/+9 |
| | | | | | |||||
| | * | | | add kube_namespace and standardize common variables for additional metrics ↵ | Pawel Chojnacki | 2017-07-31 | 3 | -12/+24 |
| | | | | | | | | | | | | | | | | | queries | ||||
| * | | | | Merge branch 'fix/sm/35825-api-specs-and-linting-failing-on-master' into ↵ | Rémy Coutable | 2017-08-01 | 2 | -4/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix "API specs and linting failing on master" Closes #35825 See merge request !13227 | ||||
| | * | | | | Add 204. Remove duplicated method.fix/sm/35825-api-specs-and-linting-failing-on-master | Shinya Maeda | 2017-08-01 | 2 | -4/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'rc/fetch-before-finding-merge-base-in-ee_compat_check' into ↵ | Sean McGivern | 2017-08-01 | 1 | -2/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Always fetch branches before finding the merge base, otherwise we could find an outdated merge base See merge request !13226 | ||||
| | * | | | | | Always fetch branches before finding the merge base, otherwise we could find ↵rc/fetch-before-finding-merge-base-in-ee_compat_check | Rémy Coutable | 2017-08-01 | 1 | -2/+0 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | an outdated merge base Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | Merge branch '28283-legacy-storage-format' into 'master' | Sean McGivern | 2017-08-01 | 16 | -27/+28 |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | [CE] Added Legacy Storage format See merge request !13149 | ||||
| | * | | | | Rename ensure_dir_exist -> ensure_storage_path_exist | Gabriel Mazetto | 2017-08-01 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Added some extra TODOs for the Legacy Storage refactor | Gabriel Mazetto | 2017-08-01 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Rename more path_with_namespace -> full_path or disk_path | Gabriel Mazetto | 2017-08-01 | 7 | -10/+10 |
| | | | | | | |||||
| | * | | | | Rename path_with_namespace -> disk_path when dealing with the filesystem | Gabriel Mazetto | 2017-08-01 | 2 | -3/+3 |
| | | | | | | |||||
| | * | | | | Rename many path_with_namespace -> full_path | Gabriel Mazetto | 2017-08-01 | 9 | -14/+14 |
| | | | | | | |||||
| * | | | | | Merge branch 'gitaly-commit-languages' into 'master' | Sean McGivern | 2017-08-01 | 3 | -3/+43 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add option to use Gitaly CommitLanguages RPC See merge request !13084 | ||||
| | * | | | | | Add option to use CommitLanguages RPC | Jacob Vosmaer | 2017-08-01 | 2 | -0/+34 |
| | | | | | | | |||||
| | * | | | | | CI fixes for gitaly-ruby | Jacob Vosmaer | 2017-08-01 | 1 | -3/+9 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'remove-content-commit' into 'master' | Douwe Maan | 2017-08-01 | 1 | -18/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused Gitlab::Diff code See merge request !13195 | ||||
| | * | | | | | | Remove unused (?) code | Jacob Vosmaer | 2017-07-31 | 1 | -18/+0 |
| | | |_|/ / / | |/| | | | | |||||
| * | | | | | | Merge branch 'patch-25' into 'master' | Rémy Coutable | 2017-08-01 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invalid variable See merge request !13214 | ||||
| | * | | | | | | Invalid variable | Semen Romanov | 2017-08-01 | 1 | -3/+3 |
| | | |_|/ / / | |/| | | | | |||||
| * | | | | | | Merge branch '34519-extend-api-group-secret-variable' into 'master' | Kamil Trzciński | 2017-08-01 | 3 | -0/+100 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend API: Group Secret Variable Closes #34519 See merge request !12936 | ||||
| | * | | | | | Ini | Shinya Maeda | 2017-07-19 | 3 | -0/+100 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'mk-fix-wiki-backup' into 'master' | Douwe Maan | 2017-07-31 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix improperly skipped backups of wikis Closes #28854 See merge request !13096 | ||||
| | * | | | | | | Protect backups from stale cache for repo exists | Michael Kozono | 2017-07-28 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'fix/gb/fix-chatops-deploy-multiple-actions-matching' into 'master' | Kamil Trzciński | 2017-07-31 | 2 | -21/+23 |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve deploy environment chatops slash command Closes #34748 See merge request !13150 | ||||
| | * | | | | | | Improve wording related to deploy chatops commandfix/gb/fix-chatops-deploy-multiple-actions-matching | Grzegorz Bizon | 2017-07-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Improve deploy environment chatops slash command | Grzegorz Bizon | 2017-07-28 | 2 | -21/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now match deployment actions better. If there is more than one deployment action matched, we check if there is an action which name equals to environment name, instead of raising an error about too many actions defined. | ||||
| * | | | | | | | Merge branch '29385/add_shrug_command' into 'master' | Rémy Coutable | 2017-07-31 | 3 | -5/+70 |
| |\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #29385: Add /shrug and /tableflip commands Closes #29385 See merge request !10068 | ||||
| | * | | | | | | Fixes #29385: Add /shrug and /tableflip commands | Alex Ives | 2017-07-28 | 3 | -5/+70 |
| | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updated DSL to support substitution definitions - Added substitution definition, inherits from command definition - Added tabelflip and shrug substitutions to interpret service - Added support for substitution definitions to the extractor for preview mode. - Added substitution handling in the interpret service Signed-off-by: Alex Ives <alex@ives.mn> | ||||
| * | | | | | | Merge branch 'dm-ldap-authentication-ssl-verification' into 'master' | Sean McGivern | 2017-07-31 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor Closes #35752 See merge request !13185 | ||||
| | * | | | | | | Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptordm-ldap-authentication-ssl-verification | Douwe Maan | 2017-07-31 | 1 | -1/+1 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch 'gitaly-398-git-garbage-collect' into 'master' | Sean McGivern | 2017-07-31 | 1 | -1/+17 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate GitGarbageCollectWorker to Gitaly Closes gitaly#398 See merge request !12975 | ||||
| | * | | | | | Migrate GitGarbageCollectWorker to Gitalygitaly-398-git-garbage-collect | Kim "BKC" Carlbäcker | 2017-07-28 | 1 | -1/+17 |
| | | | | | | | |||||
| * | | | | | | Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into ↵ | Robert Speicher | 2017-07-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Ensure Gitlab.config.gitlab.host/port and Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs Closes #35599 See merge request !13126 | ||||
| | * | | | | | | Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵ | Rémy Coutable | 2017-07-28 | 1 | -1/+1 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Merge branch 'dm-large-push-performance' into 'master' | Robert Speicher | 2017-07-28 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load and process at most 100 commits when pushing into default branch Closes #35531 See merge request !13132 | ||||
| | * | | | | | | Load and process at most 100 commits when pushing into default branch | Douwe Maan | 2017-07-28 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id | Richard Clamp | 2017-07-28 | 1 | -2/+6 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'dm-api-csrf-token-verification' into 'master' | Sean McGivern | 2017-07-28 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add log messages to clarify log messages about API CSRF token verification failure Closes #35705 See merge request !13158 | ||||
| | * | | | | | | Add log messages to clarify log messages about API CSRF token verification ↵dm-api-csrf-token-verification | Douwe Maan | 2017-07-28 | 1 | -0/+8 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | failure | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |