summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* merge master and resolve conflictsMartin Wortschack2018-09-0610-33/+124
|\
| * Merge branch 'sh-fix-attachments-inline' into 'master'Nick Thomas2018-09-062-1/+30
| |\
| | * Fix attachments not displaying inline with Google Cloud StorageStan Hu2018-09-052-1/+30
| * | Add User-Agent to production_json.logStan Hu2018-09-051-1/+2
| |/
| * Add license info of unknown libraries to license_finder configuration instead...Balasankar "Balu" C2018-09-051-10/+18
| * Make MySQL patch for binary indexes compatible with composite indexesOlivier Gonzalez2018-09-041-2/+4
| * Merge branch 'rails5-include-opclasses-in-schema-dump' into 'master'Yorick Peterse2018-09-041-19/+31
| |\
| | * Rails 5: include opclasses in rails 5 schema dumpJasper Maes2018-08-291-19/+31
| * | Rails 5: support schema t.index for mysqlJasper Maes2018-09-031-0/+28
| * | Move badge settings to general settingsWinnie Hellmann2018-09-032-2/+0
| * | Merge branch 'sh-bump-unauth-expiration' into 'master'Douwe Maan2018-09-031-1/+1
| |\ \
| | * | Bump unauthenticated session time from 1 hour to 2 hoursStan Hu2018-08-311-1/+1
| | |/
| * | Merge branch 'sh-disable-sidekiq-session' into 'master'Sean McGivern2018-09-031-0/+6
| |\ \
| | * | Disable the Sidekiq Admin Rack sessionStan Hu2018-08-311-0/+6
| | |/
| * | Merge branch 'winh-ignore-npm-devdependencies' into 'master'Phil Hughes2018-09-031-0/+7
| |\ \ | | |/ | |/|
| | * Exclude frontend development dependencies from license restrictionsWinnie Hellmann2018-08-301-0/+7
* | | adds 'Geo' sub page to application settingsMartin Wortschack2018-09-051-1/+1
* | | split application settings into multiple sub pagesMartin Wortschack2018-09-041-0/+1
|/ /
* | [master] Missing CSRF in System Hooks resend actionFrancisco Javier López2018-08-282-2/+2
* | Merge branch 'issue_36138' into 'master'Sean McGivern2018-08-281-1/+1
|\ \ | |/ |/|
| * Allow to delete group milestonesissue_36138Felipe Artur2018-08-061-1/+1
* | Bump fog-google to 1.7.1 and google-api-client to 0.23.0sh-bump-fog-googleStan Hu2018-08-211-1/+1
* | Backport of gitlab-org/gitlab-ee!6876ce-6752-jira-branchesMario de la Ossa2018-08-201-0/+7
* | Merge branch 'rails5-verbose-query-logs' into 'master'Robert Speicher2018-08-161-1/+3
|\ \
| * | Rails5: Enable verbose query logsJasper Maes2018-08-161-1/+3
* | | Frontend: Proper gettext extraction with gettext-extractor🌴🇿🇦 Lukas Eipert (OOO until Summit)2018-08-161-0/+15
* | | Add ci_archive_traces_cron_worker configuration to gitlab.yml.exampleShinya Maeda2018-08-161-0/+3
|/ /
* | Merge branch 'enable-verbose-query-logs' into 'master'Robert Speicher2018-08-071-0/+54
|\ \
| * | Enable verbose query loggingenable-verbose-query-logsKamil Trzciński2018-08-071-0/+54
* | | Web IDE & CodeSandboxPhil Hughes2018-08-071-0/+24
* | | Merge branch 'sh-support-bitbucket-server-import' into 'master'Tim Zallmann2018-08-061-0/+7
|\ \ \
| * \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-317-8/+37
| |\ \ \ | | |/ /
| * | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-276-3/+16
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-256-54/+29
| |\ \ \
| * \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-202-1/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-192-6/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-181-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-175-9/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-122-0/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-094-5/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-073-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-054-78/+9
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-034-54/+55
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-06-284-32/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-06-265-13/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | WIP: Add support for Bitbucket Server importsStan Hu2018-06-251-0/+7
* | | | | | | | | | | | | | | | Merge branch '25990-improve-web-terminal' into 'master'Phil Hughes2018-08-061-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Focus terminal on loadFilipa Lacerda2018-08-031-2/+2
| * | | | | | | | | | | | | | | | Uses npm css and removes css from vendor folderFilipa Lacerda2018-08-031-1/+4
* | | | | | | | | | | | | | | | | Merge branch 'artifact-format-v2-with-parser' into 'master'Kamil Trzciński2018-08-031-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status