summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changelog entry44541-fix-file-tree-commit-status-cacheLin Jen-Shin2018-03-261-0/+5
* Add a test which could verify it's showing the right pipelineLin Jen-Shin2018-03-261-0/+36
* Make sure cache key does respect ref in commit treeLin Jen-Shin2018-03-261-0/+1
* Merge branch 'ide-diff-cursor' into 'master'Tim Zallmann2018-03-263-0/+12
|\
| * Disable cursor for review mode in the IDEide-diff-cursorPhil Hughes2018-03-233-0/+12
* | Merge branch '43316-controller-parameters-handling-sensitive-information-shou...Kamil Trzciński2018-03-2613-22/+35
|\ \
| * | Make Variable key not secret43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-nameMatija Čupić2018-03-2212-24/+21
| * | Revert "Filter secret CI variable values from logs"Matija Čupić2018-03-191-2/+0
| * | Check for secret_key and secret_value in CI Variable native list js specMatija Čupić2018-03-171-2/+2
| * | Use secret_key and secret_value in Pipeline Schedule variablesMatija Čupić2018-03-174-13/+18
| * | Add CHANGELOGMatija Čupić2018-03-171-0/+5
| * | Filter secret CI variable values from logsMatija Čupić2018-03-171-0/+2
| * | Use secret_key and secret_value in CI variable frontendMatija Čupić2018-03-171-4/+4
| * | Alias secret_key and secret_value to key and valueMatija Čupić2018-03-174-12/+8
| * | Use secret_key and secret_value in variable form field namesMatija Čupić2018-03-161-2/+2
| * | Use secret_key and secret_value in Variables controllerMatija Čupić2018-03-163-12/+22
* | | Merge branch 'patch-19' into 'master'Achilleas Pipinellis2018-03-261-2/+4
|\ \ \
| * | | add SHA1 fingerprint requirementBen Bodenmiller2018-03-261-2/+4
|/ / /
* | | Merge branch 'ab-43150-users-controller-show-query-limit' into 'master'Yorick Peterse2018-03-262-5/+10
|\ \ \
| * | | Remove N+1 query for Noteable association.ab-43150-users-controller-show-query-limitAndreas Brandl2018-03-232-5/+10
* | | | Merge branch 'fix-40798-namespace-forking' into 'master'Douwe Maan2018-03-264-10/+22
|\ \ \ \
| * | | | Resolve "Forking with namespace doesn't work (API)"Jan2018-03-264-10/+22
|/ / / /
* | | | Merge branch '40843-update-grape-to-v1-0-2-when-it-is-released' into 'master'Douwe Maan2018-03-262-8/+3
|\ \ \ \
| * | | | Updated grape to `1.0.2` to remove workaround40843-update-grape-to-v1-0-2-when-it-is-releasedJames Edwards-Jones2018-03-262-8/+3
* | | | | Merge branch 'docs/rs-update-changelog' into 'master'Douwe Maan2018-03-261-1/+5
|\ \ \ \ \
| * | | | | Add missing changelog entries for 10.6.0docs/rs-update-changelogRobert Speicher2018-03-231-1/+5
| |/ / / /
* | | | | Merge branch '44581-meta-use-prettier-ignore-file-in-our-save-script' into 'm...Phil Hughes2018-03-263-1/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make use of the prettier ignore file during our save scriptLukas Eipert2018-03-263-1/+24
|/ / / /
* | | | Merge branch 'blackst0ne-rails5-update-files-by-rails-app-update' into 'master'43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queriesRobert Speicher2018-03-2311-24/+163
|\ \ \ \
| * | | | [Rails5] Update files by `rails app:update`blackst0ne-rails5-update-files-by-rails-app-updateblackst0ne2018-03-2211-24/+163
* | | | | Merge branch '28857-followup-fix-pages-test' into 'master'Robert Speicher2018-03-231-3/+4
|\ \ \ \ \
| * | | | | Fix a spec that will break in EENick Thomas2018-03-231-3/+4
* | | | | | Merge branch 'winh-cleanup-comment-submit-test' into 'master'Clement Ho2018-03-232-95/+228
|\ \ \ \ \ \
| * | | | | | Cleanup test for disabling comment submit buttonwinh-cleanup-comment-submit-testWinnie Hellmann2018-03-222-95/+228
* | | | | | | Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-ut...Stan Hu2018-03-237-17/+73
|\ \ \ \ \ \ \
| * | | | | | | Fix 500 error when trying to resolve non-ASCII conflicts in editorSean McGivern2018-03-237-17/+73
* | | | | | | | Merge branch '44218-add-internationalization-support-for-the-prometheus-merge...Filipa Lacerda2018-03-233-41/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | Add i18n support for the mrWidget prometheus memory widget44218-add-internationalization-support-for-the-prometheus-merge-request-widgetJose Ivan Vargas2018-03-233-41/+83
* | | | | | | | | Merge branch '44589-problem-with-prettier-setting-trailingcomma-all' into 'ma...Filipa Lacerda2018-03-238-87/+88
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ensure stylesheets are included as well, make prettierrc even more inclusiveMike Greiling2018-03-232-1/+2
| * | | | | | | | | make babel-transpiled overrides more inclusive and reduce conflicts with EEMike Greiling2018-03-231-1/+1
| * | | | | | | | | update eslintignore for node scriptsMike Greiling2018-03-233-4/+3
| * | | | | | | | | prettify all node scriptsMike Greiling2018-03-235-79/+74
| * | | | | | | | | ignore generated locale files with prettierMike Greiling2018-03-231-0/+1
| * | | | | | | | | update prettier config to differentiate node scripts from babel compiled modulesMike Greiling2018-03-232-4/+9
* | | | | | | | | | Merge branch 'docs/gitlab-com-settings' into 'master'Marcia Ramos2018-03-231-0/+262
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move GitLab.com settings under main docsAchilleas Pipinellis2018-03-231-0/+262
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gitlab-shell-7.1.1' into 'master'Douwe Maan2018-03-231-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use gitlab-shell 7.1.1gitlab-shell-7.1.1Jacob Vosmaer2018-03-231-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master'Robert Speicher2018-03-232-1/+6
|\ \ \ \ \ \ \ \ \ \