Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'da-capitalize-db-apapter-name-on-rails-console' into 'master' | Stan Hu | 2019-03-22 | 2 | -4/+6 |
|\ | |||||
| * | Add helper method to return a human-friendly name for database adapter | Douglas Barbosa Alexandre | 2019-03-21 | 2 | -4/+6 |
* | | Merge branch '59147-duplicate-match-line' into 'master' | Douwe Maan | 2019-03-21 | 1 | -10/+15 |
|\ \ | |||||
| * | | Fix diff bottom expand button appears twice | Mark Chao | 2019-03-21 | 1 | -10/+15 |
* | | | Merge branch '10514-fix-non-existing-authorized-keys-file' into 'master' | Nick Thomas | 2019-03-21 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | Handle cases when authorized_keys doesn't exist | Patrick Bajao | 2019-03-20 | 1 | -0/+4 |
* | | | | Merge branch '59289-fix-push-to-create-protected-branches' into 'master' | Douwe Maan | 2019-03-21 | 1 | -0/+2 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Allow users to create protected branches via CLI | Patrick Bajao | 2019-03-21 | 1 | -0/+2 |
* | | | | Revert "Merge branch '58805-allow-incomplete-commit-data-to-be-fetched-from-c... | Sean McGivern | 2019-03-21 | 1 | -5/+1 |
|/ / / | |||||
* | | | Merge branch 'osw-multi-line-suggestions-parsing' into 'master' | Grzegorz Bizon | 2019-03-21 | 5 | -6/+59 |
|\ \ \ | |||||
| * | | | Implement multi-line suggestions filtering | Oswaldo Ferreira | 2019-03-20 | 5 | -6/+59 |
* | | | | Merge branch 'ce-1974-update-user-name-upon-ldap-sync' into 'master' | Douwe Maan | 2019-03-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Handle nil name in Gitlab::Auth::LDAP::Person#name | Rémy Coutable | 2019-03-20 | 1 | -1/+1 |
* | | | | | Merge branch '58805-allow-incomplete-commit-data-to-be-fetched-from-collectio... | Sean McGivern | 2019-03-21 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Enrich commits with full data in CommitCollection | Luke Duncalfe | 2019-03-18 | 1 | -1/+5 |
* | | | | | | Update dashboards to additionally use new environment selector | James Fargher | 2019-03-21 | 2 | -0/+28 |
* | | | | | | Merge branch '57115-just-in-time-k8s-resource-creation' into 'master' | Clement Ho | 2019-03-20 | 8 | -1/+165 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't recreate Kubernetes namespaces if they exist | Tiger | 2019-03-20 | 2 | -7/+9 |
| * | | | | | | Create one Kubernetes namespace for a deployment | Tiger | 2019-03-20 | 2 | -17/+7 |
| * | | | | | | Add build prerequisite for Kubernetes namespaces | Tiger | 2019-03-20 | 2 | -1/+49 |
| * | | | | | | Create framework for build prerequisites | Tiger | 2019-03-20 | 3 | -1/+62 |
| * | | | | | | Add :preparing status to HasStatus | Tiger | 2019-03-20 | 4 | -0/+63 |
* | | | | | | | Merge branch 'dz-bump-httparty' into 'master' | Stan Hu | 2019-03-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bump httparty to version 1.16.4 | Dmitriy Zaporozhets | 2019-03-19 | 1 | -1/+1 |
* | | | | | | | | Merge branch '57598-use-vendored-files-for-ci-config' into 'master' | Grzegorz Bizon | 2019-03-20 | 23 | -64/+52 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move gitlab-org specific config to .gitlab-ci.yml | Matija Čupić | 2019-03-15 | 1 | -7/+0 |
| * | | | | | | | | Hardcode CodeQuality version used | Matija Čupić | 2019-03-15 | 1 | -3/+1 |
| * | | | | | | | | Add Code-Quality CI template | Matija Čupić | 2019-03-15 | 1 | -0/+26 |
| * | | | | | | | | Tidy up CI templates | Matija Čupić | 2019-03-15 | 22 | -64/+35 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Gracefully handles excluded fields from attributes during serialization | Douglas Barbosa Alexandre | 2019-03-20 | 1 | -2/+17 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'ce-avoid_es_loading_commits' into 'master' | Nick Thomas | 2019-03-20 | 1 | -1/+8 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Backport of avoid_es_loading_commits | Mario de la Ossa | 2019-03-19 | 1 | -1/+8 |
* | | | | | | | GitHub import: Create new branches as project owner | Stan Hu | 2019-03-19 | 1 | -1/+1 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge branch '58844-follow-up-from-don-t-create-ee-specific-files-when-creati... | Lin Jen-Shin | 2019-03-19 | 1 | -1/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Simplify the JavaScriptFixturesHelpers module | Rémy Coutable | 2019-03-19 | 1 | -1/+12 |
* | | | | | | | Integrate Gitlab::Keys with Gitlab::Shell | Patrick Bajao | 2019-03-19 | 3 | -68/+225 |
* | | | | | | | Merge branch 'revert-b24c0c8d' into 'master' | Lin Jen-Shin | 2019-03-19 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "Merge branch..." | Rémy Coutable | 2019-03-19 | 1 | -1/+0 |
* | | | | | | | | Merge branch 'feature/users-search-results' into 'master' | Sean McGivern | 2019-03-19 | 5 | -4/+65 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Apply suggestion to lib/api/search.rb | Alexis Reigel | 2019-03-15 | 1 | -1/+1 |
| * | | | | | | | un-dry the search api scope | Alexis Reigel | 2019-03-14 | 1 | -12/+12 |
| * | | | | | | | return 400 on users search and feature is disabled | Alexis Reigel | 2019-03-14 | 1 | -8/+11 |
| * | | | | | | | move users method to public section | Alexis Reigel | 2019-03-14 | 1 | -6/+6 |
| * | | | | | | | add feature flag for users search | Alexis Reigel | 2019-03-14 | 1 | -1/+8 |
| * | | | | | | | extract helper for search scope api param | Alexis Reigel | 2019-03-14 | 1 | -12/+12 |
| * | | | | | | | check ability for user search results | Alexis Reigel | 2019-03-14 | 1 | -0/+2 |
| * | | | | | | | restrict user result set by the scoped group | Alexis Reigel | 2019-03-14 | 1 | -3/+9 |
| * | | | | | | | project's user search includes group members too | Alexis Reigel | 2019-03-14 | 1 | -1/+1 |
| * | | | | | | | only users from groups the current user has access | Alexis Reigel | 2019-03-14 | 1 | -1/+8 |
| * | | | | | | | add users search to search api | Alexis Reigel | 2019-03-14 | 2 | -4/+5 |