summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Minor policy refinements.csp-basicsConnor Shea2016-07-181-8/+12
* Document the CSP file.Connor Shea2016-07-181-11/+38
* Only enable CSP policies when relevant features are enabled.Connor Shea2016-07-181-1/+27
* Remove background_jobs-specific headers.Connor Shea2016-07-182-7/+0
* Only report to Sentry when it's enabled.Connor Shea2016-07-181-2/+6
* Add Sidekiq-specific headers.Connor Shea2016-07-182-6/+12
* Add the CSP reporting URI of Sentry.Connor Shea2016-07-181-1/+8
* Update image policy to allow external images over HTTPS.Connor Shea2016-07-181-1/+1
* Remove unsafe eval directive from scripts.Connor Shea2016-07-181-1/+1
* Fix that which hath been broken. Except the sidekiq admin iframe.Connor Shea2016-07-182-0/+42
* Initial secure_headers config after some testing.Connor Shea2016-07-182-0/+7
* Merge branch 'dz-improve-markdown' into 'master' Dmitriy Zaporozhets2016-07-182-16/+18
|\
| * Reduce font-size for headers for nicer and more compact lookdz-improve-markdownDmitriy Zaporozhets2016-07-181-3/+3
| * Merge branch 'patch1' of https://gitlab.com/sheerun/gitlab-ce into dz-improve...Dmitriy Zaporozhets2016-07-182-16/+18
| |\
| | * Improve readability of markdown filesAdam Stankiewicz2016-07-112-16/+18
* | | Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-1835-304/+507
|\ \ \
| * | | Remove `lock_version` from the `merge_requests` table.undo-revert-of-4892Timothy Andrew2016-07-181-1/+0
| * | | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-1835-304/+508
| |/ /
* | | Merge branch 'master' into 'master' Jacob Schatz2016-07-182-1/+2
|\ \ \
| * | | Update CHANGELOG fix indenting.eanplatter2016-07-181-1/+1
| * | | Fix activity heatmap to show proper day name.eanplatter2016-07-162-1/+2
* | | | Merge branch '19928-nomethoderror-undefined-method-id-for-nil-nilclass' into ...Rémy Coutable2016-07-182-1/+21
|\ \ \ \
| * | | | Don't blow up in tree view on empty repoSean McGivern2016-07-182-1/+21
* | | | | Merge branch '18593-avoid-parse_html-when-rinku-didnt-do-anything' into 'mast...Yorick Peterse2016-07-183-0/+23
|\ \ \ \ \
| * | | | | Don't parse Rinku returned value to DocFragment when it didn't change the ori...18593-avoid-parse_html-when-rinku-didnt-do-anythingPaco Guzman2016-07-183-0/+23
* | | | | | Merge branch 'fix-track-user-migration' into 'master' Rémy Coutable2016-07-181-0/+2
|\ \ \ \ \ \
| * | | | | | Disable transaction when adding index for Ci::PipelineKamil Trzcinski2016-07-181-0/+2
|/ / / / / /
* | | | | | Merge branch 'store-variables-and-when-in-builds-table' into 'master' Rémy Coutable2016-07-189-125/+151
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into store-variables...store-variables-and-when-in-builds-tableKamil Trzcinski2016-07-18111-1673/+1979
| |\ \ \ \ \
| * | | | | | Refactor gitlab_ci_yaml_processor variables testsKamil Trzcinski2016-07-171-52/+76
| * | | | | | Remove irrelevant commentsKamil Trzcinski2016-07-161-14/+0
| * | | | | | Fix gitlab_ci_yaml_processor_spec.rbKamil Trzcinski2016-07-161-5/+5
| * | | | | | Fix AddWhenAndYamlVariablesToCiBuilds migrationKamil Trzcinski2016-07-161-1/+1
| * | | | | | Fix gitlab_ci_yaml_processor_spec.rbKamil Trzcinski2016-07-161-1/+1
| * | | | | | Store when and yaml variables in builds tableKamil Trzcinski2016-07-169-73/+89
* | | | | | | Merge branch 'docker-registry-work-with-redirect' into 'master' Rémy Coutable2016-07-185-35/+138
|\ \ \ \ \ \ \
| * | | | | | | Update CHANGELOGdocker-registry-work-with-redirectKamil Trzciński2016-07-151-1/+0
| * | | | | | | Make rubocop happyKamil Trzcinski2016-07-151-1/+1
| * | | | | | | Add CHANGELOGKamil Trzcinski2016-07-151-0/+1
| * | | | | | | Explicitly remove authorization token and make sure that invalid addresses ar...Kamil Trzcinski2016-07-153-51/+122
| * | | | | | | Allow blob to be redirectedKamil Trzcinski2016-07-151-3/+34
| * | | | | | | Make docker registry work with location redirects when external storage is usedKamil Trzcinski2016-07-152-1/+2
* | | | | | | | Merge branch 'pending-tab' into 'master' Rémy Coutable2016-07-187-21/+90
|\ \ \ \ \ \ \ \
| * | | | | | | | Modify test for Build tabsKatarzyna Kobierska2016-07-181-18/+26
| * | | | | | | | Add tests to project builds for pending tabKatarzyna Kobierska2016-07-182-5/+13
| * | | | | | | | Remove unused .js-running-count classKatarzyna Kobierska2016-07-182-6/+6
| * | | | | | | | Add test for new pending tab and update tests for running tabKatarzyna Kobierska2016-07-181-1/+35
| * | | | | | | | Add Pending Tab to Admin BuildsKatarzyna Kobierska2016-07-185-4/+23
* | | | | | | | | Merge branch 'fix/import-no-repo' into 'master' Rémy Coutable2016-07-185-10/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | added changelogJames Lopez2016-07-181-0/+1