summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* FE review, replace timeout with nexttick and improve assertion helper. add ch...fix-md-form-tabs-double-click-toggleLuke "Jared" Bennett2017-11-042-16/+20
* Fix karmaLuke "Jared" Bennett2017-11-022-6/+8
* Separate preview and write tabs into seperate eventsLuke "Jared" Bennett2017-11-022-24/+26
* Fix markdown-preview events for new isPreview varLuke "Jared" Bennett2017-11-011-5/+12
* Correct selector in field_specLuke "Jared" Bennett2017-11-011-1/+1
* Let field.vue handle the changing of previewLuke "Jared" Bennett2017-11-013-13/+13
* Use settimeoutpromise in field_specLuke "Jared" Bennett2017-11-011-23/+14
* Dont emit toggle-markdown event if current target is already active and add s...Luke "Jared" Bennett2017-11-012-5/+47
* Merge branch 'fix-non-diff-resolved-discussion' into 'master'Phil Hughes2017-10-203-7/+29
|\
| * Force non diff resolved discussion to display when collapse toggledClement Ho2017-10-203-7/+29
|/
* Merge branch '37391-wiki-disk-path-helper' into 'master'Nick Thomas2017-10-204-4/+4
|\
| * Use wiki.disk_pathNick Thomas2017-10-184-4/+4
* | Merge branch 'patch-24' into 'master'Rémy Coutable2017-10-201-0/+6
|\ \
| * | add note about after_script being run separatelyMartin Nowak2017-10-201-0/+6
|/ /
* | Merge branch 'animate-auto-devops' into 'master'Annabel Dunstone Gray2017-10-203-2/+18
|\ \
| * | Animate auto devops graphicanimate-auto-devopsClement Ho2017-10-183-2/+18
* | | Merge branch 'update-nav-sidebar-hover' into 'master'Annabel Dunstone Gray2017-10-191-3/+3
|\ \ \
| * | | update nav sidebar hover color to increase contrastupdate-nav-sidebar-hovertauriedavis2017-10-111-3/+3
* | | | Merge branch 'docs/Wernight/gitlab-ce-patch-28' into 'master'Achilleas Pipinellis2017-10-191-19/+0
|\ \ \ \
| * | | | Updates google.md to match current version.docs/Wernight/gitlab-ce-patch-28Werner Beroux2017-10-171-19/+0
* | | | | Merge branch 'sh-document-plus-encoding-api' into 'master'Achilleas Pipinellis2017-10-191-0/+17
|\ \ \ \ \
| * | | | | Document converting `+` to `%2B` in an API query parametersh-document-plus-encoding-apiStan Hu2017-10-181-0/+17
* | | | | | Merge branch 'sh-api-json-logs' into 'master'Achilleas Pipinellis2017-10-191-2/+22
|\ \ \ \ \ \
| * | | | | | Add docs for `api_json.log` filesh-api-json-logsStan Hu2017-10-181-2/+22
* | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2017-10-1915-1147/+8176
|\ \ \ \ \ \ \
| * | | | | | | Merge branch 'master-i18n' into 'master'Douwe Maan2017-10-1915-1147/+8176
|/ / / / / / /
* | | | | | | Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' ...Stan Hu2017-10-192-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Update Prometheus gem to fix problems with other files overwriting current filePawel Chojnacki2017-10-192-3/+3
* | | | | | | | Merge branch 'rc/balance-test-job-nodes' into 'master'Robert Speicher2017-10-191-63/+63
|\ \ \ \ \ \ \ \
| * | | | | | | | Reduce Spinach parallelization to 4 nodes and increase RSpec's to 26 nodesrc/balance-test-job-nodesRémy Coutable2017-10-181-63/+63
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rc/reduce-duplication-in-tests-metadata-state-job-definition' i...Robert Speicher2017-10-191-9/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve the .tests-metadata-state definition a bitrc/reduce-duplication-in-tests-metadata-state-job-definitionRémy Coutable2017-10-181-9/+4
| |/ / / / / / /
* | | | | | | | Merge branch '18765-stub_env_in_specs' into 'master'Robert Speicher2017-10-199-202/+246
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a new RSpec::EnvAssignment cop to prevent assigning to ENV in specs18765-stub_env_in_specsRémy Coutable2017-10-184-5/+135
| * | | | | | | | Stub ENV in the LDAP task spec fileRémy Coutable2017-10-181-1/+1
| * | | | | | | | Stub ENV in the Gitaly task spec fileRémy Coutable2017-10-181-8/+1
| * | | | | | | | Stub ENV in the backup task spec fileRémy Coutable2017-10-183-188/+109
| |/ / / / / / /
* | | | | | | | Merge branch 'not-found-in-commits' into 'master'Douwe Maan2017-10-194-3/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Renders 404 in commits controller if no commits are foundGuilherme Vieira2017-10-184-3/+37
* | | | | | | | | Merge branch '34754-graphql-policy-update' into 'master'Douwe Maan2017-10-192-1/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update GraphQL licensing situation in the docsNick Thomas2017-10-182-1/+17
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-fix-broken-docker-delete' into 'master'Grzegorz Bizon2017-10-194-5/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix broken function invocationsh-fix-broken-docker-deleteFilipa Lacerda2017-10-192-2/+2
| * | | | | | | | | Fix inability to delete container registry tagsStan Hu2017-10-182-3/+8
| |/ / / / / / / /
* | | | | | | | | Merge branch 'encoding-helper-performance' into 'master'Rémy Coutable2017-10-192-4/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Avoind unnecesary `force_encoding` operationsAlejandro Rodríguez2017-10-182-4/+19
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '38648-members-sidebar' into 'master'Phil Hughes2017-10-191-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add members flyout on collapsed sidebar38648-members-sidebarAnnabel Dunstone Gray2017-10-181-0/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '38869-dropzone-input' into 'master'Phil Hughes2017-10-197-309/+269
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Remove dropzoneInput from global namespaceFilipa Lacerda2017-10-197-309/+269
|/ / / / / / / /