summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make Service.external_wikis return only active external wikisRémy Coutable2016-07-214-29/+52
* Merge branch 'manual-action-grammar' into 'master' Achilleas Pipinellis2016-07-211-9/+11
|\
| * Mention manual actions section in when clause docsmanual-action-grammarAchilleas Pipinellis2016-07-211-4/+6
| * Improve grammar of manual actions documentationMark Pundsack2016-07-211-5/+5
* | Merge branch '4142-show-inline-video' into 'master' Rémy Coutable2016-07-2124-44/+249
|\ \
| * | Don't allow `.ogg` as a valid video extension4142-show-inline-videoRémy Coutable2016-07-212-2/+2
| * | Add CHANGELOG item for videos support in GFMRémy Coutable2016-07-211-0/+1
| * | Remove VideoJS and clean the integrationRémy Coutable2016-07-2025-24621/+102
| * | Use a more powerful query to match videos in img tagsRémy Coutable2016-07-193-20/+51
| * | Remove duplication, useless rescue, and avoid using ActionViewRémy Coutable2016-07-193-31/+27
| * | Get rid of `is_image` in FileUploaderRémy Coutable2016-07-198-24/+5
| * | First support of videos in issues, MRs and notesEric Hayes2016-07-1923-14/+24729
* | | Merge branch 're-deploy-button' into 'master' Rémy Coutable2016-07-213-5/+6
|\ \ \ | |_|/ |/| |
| * | Use Re-deploy button on Deployments pagere-deploy-buttonKamil Trzcinski2016-07-203-5/+6
* | | Merge branch 'registry-manifest' into 'master' Achilleas Pipinellis2016-07-211-1/+2
|\ \ \
| * | | Document when Docker Registery manifest v1 support was addedregistry-manifestMark Pundsack2016-07-201-1/+2
* | | | Merge branch 'artifact-name' into 'master' Achilleas Pipinellis2016-07-211-2/+3
|\ \ \ \
| * | | | Clarify artifacts:name default valueartifact-nameMark Pundsack2016-07-201-2/+3
| |/ / /
* | | | Merge branch 'rs-revert-csp' into 'master' Robert Speicher2016-07-213-106/+0
|\ \ \ \
| * | | | Revert "Merge branch 'csp-basics' into 'master' "Robert Speicher2016-07-203-116/+0
| * | | | Revert "Merge branch 'remove-csp-sentry-reporting' into 'master' "Robert Speicher2016-07-201-2/+12
|/ / / /
* | | | Merge branch 'remove-flaky-diff-note-tests' into 'master' Douwe Maan2016-07-211-94/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove flaky diff note tests for nowremove-flaky-diff-note-testsDouwe Maan2016-07-201-94/+0
* | | | Merge branch 'sidebar-clipboard-toggle' into 'master' Fatih Acet2016-07-203-1/+5
|\ \ \ \
| * | | | Prevent toggling sidebar when clipboard icon clicked.sidebar-clipboard-toggleFatih Acet2016-07-203-1/+5
* | | | | Merge branch '18586-user-authorized_projects-is-slow' into 'master' Yorick Peterse2016-07-206-0/+152
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Refactor user authorization check for a single project to avoid querying all ...Alejandro Rodríguez2016-07-206-0/+152
* | | | | Merge branch 'email-domain-blacklist' into 'master' Robert Speicher2016-07-2019-76/+318
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Reorder allowed params for `ApplicationSetting` and add more details to docs.email-domain-blacklistPatricio Cano2016-07-192-3/+9
| * | | | Removed escaping characters by using double quotes.Patricio Cano2016-07-181-1/+1
| * | | | Default to manual input for `domain_whitelist`, syntax fixes and added new te...Patricio Cano2016-07-186-10/+19
| * | | | Refactor `match_domain` to a predicate: `domain_matches?`Patricio Cano2016-07-181-3/+3
| * | | | Refactor and rename `restricted_signup_domains` to `domain_whitelist` to bett...Patricio Cano2016-07-1813-55/+58
| * | | | Move inline JS to admin.js.coffee specific file.Patricio Cano2016-07-181-0/+12
| * | | | Refactored the domain separator regex, plus syntax and grammar fixes.Patricio Cano2016-07-184-20/+19
| * | | | Make sure email domain validation method is private.Patricio Cano2016-07-181-28/+26
| * | | | Fixed `signup_domain_valid?` flow and added documentation.Patricio Cano2016-07-183-20/+39
| * | | | Added CHANGELOG item.Patricio Cano2016-07-181-0/+1
| * | | | Added the ability to block sign ups using a domain blacklist.Patricio Cano2016-07-1810-33/+228
* | | | | Merge branch 'faster-builds-ci' into 'master' Douwe Maan2016-07-201-7/+28
|\ \ \ \ \
| * | | | | Use YAML inheritance to DRY the .gitlab-ci.ymlfaster-builds-ciZ.J. van de Weg2016-07-201-19/+14
| * | | | | Speed improvement for builds without DBZ.J. van de Weg2016-06-291-8/+34
* | | | | | Merge branch 'cs-warn-on-failure' into 'master' Fatih Acet2016-07-209-10/+73
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into cs-warn-on-failurecs-warn-on-failureKamil Trzcinski2016-07-2033-105/+283
| |\ \ \ \ \ \
| * | | | | | | Use switch statements instead of if/else chains.Connor Shea2016-07-192-8/+10
| * | | | | | | Address feedback.Connor Shea2016-07-193-11/+21
| * | | | | | | Add with_warnings? method to Pipelines and add tests.Connor Shea2016-07-194-0/+35
| * | | | | | | Starting work on the warn_on_failure feature for the MR build status.Connor Shea2016-07-195-5/+23
* | | | | | | | Merge branch '14284-allow-all-deploy-keys-to-be-retrieved-via-api-regardless-...Gabriel Mazetto2016-07-206-75/+159
|\ \ \ \ \ \ \ \
| * | | | | | | | Change `return`s for `next`s to please rubocop (behaviour is the same)Alejandro Rodríguez2016-07-201-2/+2