summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '41587-osw-mr-metrics-migration-take-two' into 'master'Grzegorz Bizon2018-05-312-2/+13
|\
| * Take two for MR metrics population background migrationOswaldo Ferreira2018-05-302-2/+13
* | Export assigned issues in iCalendar feedImre Farkas2018-05-315-26/+36
* | Merge branch 'sh-fix-issue-api-perf-n-plus-one' into 'master'Nick Thomas2018-05-311-1/+1
|\ \
| * | Eliminate cached N+1 queries for projects in Issue APIStan Hu2018-05-311-1/+1
* | | Merge branch 'rails5-calendar' into 'master'Yorick Peterse2018-05-311-1/+1
|\ \ \
| * | | Replace .having with .where in calendar queryJan Provaznik2018-05-301-1/+1
* | | | Merge branch '46445-fix-gitaly-tree-entry-encoding' into 'master'Douwe Maan2018-05-311-1/+1
|\ \ \ \
| * | | | Fix encoding error in Gitaly::Commit::TreeEntryKim "BKC" Carlbäcker2018-05-301-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'fj-36819-remove-v3-api' into 'master'Douwe Maan2018-05-3142-5369/+12
|\ \ \ \
| * | | | Removed API endpoint and specsfj-36819-remove-v3-apiFrancisco Javier López2018-05-3042-5369/+12
| |/ / /
* | | | Merge branch 'dm-relative-url-root-in-development' into 'master'Rémy Coutable2018-05-312-1/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix various bugs related to relative_url_root in developmentDouwe Maan2018-05-292-1/+6
* | | | Merge branch 'sh-add-usage-ping-api-settings' into 'master'Robert Speicher2018-05-301-0/+1
|\ \ \ \
| * | | | Add missing usage_ping_enabled to API settingsStan Hu2018-05-301-0/+1
| | |/ / | |/| |
* | | | Merge branch '46999-line-profiling-modal-width' into 'master'Clement Ho2018-05-301-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix UI broken in line profiling modal due to Bootstrap 4Takuya Noguchi2018-05-311-2/+2
* | | | Merge branch 'dm-api-projects-members-preload' into 'master'Robert Speicher2018-05-302-16/+20
|\ \ \ \
| * | | | Only preload member records for the relevant projects/groups/user in projects...dm-api-projects-members-preloadDouwe Maan2018-05-302-16/+20
* | | | | Merge branch 'sh-use-grape-path-helpers' into 'master'Sean McGivern2018-05-301-1/+1
|\ \ \ \ \
| * | | | | Replace grape-route-helpers with our own grape-path-helpersStan Hu2018-05-301-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'brodock-refactor-hashed-storage-task' into 'master'Douwe Maan2018-05-302-86/+90
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Specs covering listing all gitlab:storage:* typesbrodock-refactor-hashed-storage-taskGabriel Mazetto2018-05-291-1/+1
| * | | | refactor to remove duplicationGabriel Mazetto2018-05-281-14/+12
| * | | | assign helper full name to variable to reduce code lengthGabriel Mazetto2018-05-281-10/+19
| * | | | Refactor RakeHelper to reduce complexityGabriel Mazetto2018-05-281-26/+18
| * | | | Extracted auxiliary methods from storage.rake into specific RakeHelperGabriel Mazetto2018-05-282-86/+91
* | | | | Merge branch 'fix/bitbucket_import_anonymous' into 'master'Douwe Maan2018-05-302-1/+2
|\ \ \ \ \
| * | | | | Import bitbucket issues that are reported by an anonymous userBart Libert2018-05-242-1/+2
* | | | | | Merge branch 'mattermost-api-v4' into 'master'Sean McGivern2018-05-303-6/+6
|\ \ \ \ \ \
| * | | | | | Updated Mattermost integration to use Mattermost API v4Harrison Healey2018-05-283-6/+6
* | | | | | | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-304-10/+13
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-294-10/+13
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '6045-extract-ee-specific-specs-lines' into 'master'Robert Speicher2018-05-291-2/+2
|\ \ \ \ \ \
| * | | | | | Try to fetch the CE branch in EE because sometimes it has the same name6045-extract-ee-specific-specs-linesRémy Coutable2018-05-241-2/+2
* | | | | | | Merge remote-tracking branch 'dev/master'Mayra Cabrera2018-05-297-17/+41
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'security-fj-import-export-assignment' into 'master'Mayra Cabrera2018-05-296-14/+38
| |\ \ \ \ \ \ \
| | * | | | | | | Blacklisting attributes in the project import processFrancisco Javier López2018-05-146-14/+38
| * | | | | | | | Merge branch 'security-dm-delete-deploy-key' into 'master'Mayra Cabrera2018-05-291-3/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix API to remove deploy key from project instead of deleting it entirelyDouwe Maan2018-05-041-3/+3
* | | | | | | | | | Merge branch '46758-fallout-of-cacheable-attribute' into 'master'Douwe Maan2018-05-292-4/+28
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set wh...Rémy Coutable2018-05-292-4/+28
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch '44602-clarify-update-docs-text-about-restrictions' into 'master'Achilleas Pipinellis2018-05-291-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | include groups in descriptionDavin Walker2018-05-281-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch '38759-fetch-available-parameters-directly-from-gke-when-creatin...Kamil Trzciński2018-05-291-16/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into 38759-fetch-available-param...Dennis Tang2018-05-2579-569/+1099
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove redundant GoogleApi::CloudPlatform::Client methodsMatija Čupić2018-05-111-34/+0
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into 38759-fetch-available-param...Dennis Tang2018-05-1137-84/+600
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 38759-fetch-available-parameters-directly-from-gke...Matija Čupić2018-05-0253-183/+685
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 38759-fetch-available-parameters-directly-from-gke...Matija Čupić2018-04-20249-1089/+3614
| |\ \ \ \ \ \ \ \ \ \ \