summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use Gitaly server v0.17.0update-gitaly-0-17-0Alejandro Rodríguez2017-07-111-1/+1
* Merge branch 'toggle-new-project-import-description' into 'master'Clement Ho2017-07-112-2/+7
|\
| * Toggle import description with import_sources_enabledBrianna Kicia2017-07-112-2/+7
|/
* Update CHANGELOG.md for 9.3.6kushalpandya2017-07-125-17/+7
* Merge branch '34796_add_esperanto_translations_of_pipeline_charts' into 'master'Douwe Maan2017-07-111-2/+59
|\
| * merge pipeline charts translate to gitlab.po黄涛2017-07-112-75/+59
| * Add eo translation difference of Pipeline Charts黄涛2017-07-071-0/+73
* | Merge branch '34795_add_bulgarian_translations_of_pipeline_charts' into 'master'Douwe Maan2017-07-111-2/+59
|\ \
| * | merge pipeline charts translate to gitlab.po黄涛2017-07-112-75/+59
| * | Add bg translation difference of Pipeline Charts黄涛2017-07-071-0/+73
| |/
* | Merge branch '34791_add_traditional_chinese_in_hongkong_translations_of_pipel...Douwe Maan2017-07-111-5/+57
|\ \
| * | merge pipeline charts translate to gitlab.po黄涛2017-07-112-75/+57
| * | Add zh-HK translation difference of Pipeline Charts黄涛2017-07-071-0/+70
| |/
* | Merge branch '34790_add_simplified_chinese_translations_of_pipeline_charts' i...Douwe Maan2017-07-111-2/+56
|\ \
| * | merge pipeline charts translate to gitlab.po黄涛2017-07-112-72/+56
| * | optimize translation based on discussion黄涛2017-07-101-5/+5
| * | Add zh-CN translation difference of Pipeline Charts黄涛2017-07-071-0/+70
| |/
* | Merge branch 'update-gitlab-shell' into 'master'Stan Hu2017-07-111-1/+1
|\ \
| * | Update GITLAB_SHELL_VERSION to v5.3.0Kim Carlbäcker2017-07-091-1/+1
| * | need sha apparentlyKim "BKC" Carlbäcker2017-07-081-1/+1
| * | Update GitLab ShellKim "BKC" Carlbäcker2017-07-081-1/+1
* | | Merge branch '34729-blob' into 'master'Douwe Maan2017-07-112-1/+5
|\ \ \
| * | | snippet has a blob, but isn't a blob34729-blobSimon Knox2017-07-122-1/+5
* | | | Merge branch '34867-remove-net-ssh-gem' into 'master'Rémy Coutable2017-07-113-3/+4
|\ \ \ \
| * | | | Remove net-ssh gemTakuya Noguchi2017-07-093-3/+4
* | | | | Merge branch 'sh-add-mr-simple-mode' into 'master'Sean McGivern2017-07-115-5/+48
|\ \ \ \ \
| * | | | | Use view=simple for simplifying merge requests APIStan Hu2017-07-113-5/+5
| * | | | | Add a simple mode to merge request APIsh-add-mr-simple-modeStan Hu2017-07-115-5/+48
| | |/ / / | |/| | |
* | | | | Merge branch 'jej/9-4-update-license-list' into 'master'Rémy Coutable2017-07-111-260/+300
|\ \ \ \ \
| * | | | | Updated vendor/licenses.csv for 9.4James Edwards-Jones2017-07-111-260/+300
* | | | | | Merge branch 'sh-bump-sidekiq' into 'master'Robert Speicher2017-07-111-1/+1
|\ \ \ \ \ \
| * | | | | | Update Sidekiq from 5.0.0 to 5.0.4sh-bump-sidekiqStan Hu2017-07-101-1/+1
* | | | | | | Merge branch '34907-dont-show-pipeline-schedule-button-for-non-member' into '...Kamil Trzciński2017-07-113-130/+169
|\ \ \ \ \ \ \
| * | | | | | | Do not show pipeline schedule button for non-memberTakuya Noguchi2017-07-113-130/+169
* | | | | | | | Merge branch 'sidebar-badge-fix-firefox' into 'master'Filipa Lacerda2017-07-111-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed badge alignment in new project sidebar in FireFoxsidebar-badge-fix-firefoxPhil Hughes2017-07-111-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jej/create-update-instructions-for-9-4' into 'master'Achilleas Pipinellis2017-07-111-12/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | 9.4 update instractions include changes made to 9.3 instructionsJames Edwards-Jones2017-07-111-12/+33
* | | | | | | | | Merge branch 'fix-n-plus-one-in-url-builder' into 'master'Rémy Coutable2017-07-112-5/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't reload ActiveRecord objects when building note URLsSean McGivern2017-07-112-5/+7
* | | | | | | | | | Merge branch 'jej/update-source-install-instructions-for-9-4' into 'master'Achilleas Pipinellis2017-07-111-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update source installation instructions for 9.4jej/update-source-install-instructions-for-9-4James Edwards-Jones2017-07-111-2/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jej/9-4-update-gitignore-and-license-templates' into 'master'Rémy Coutable2017-07-114-20/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Update CI templates for 9.4James Edwards-Jones2017-07-114-20/+25
| |/ / / / / / / /
* | | | | | | | | Merge branch '34933-fix-welcome-page-actions-alignment' into 'master'Phil Hughes2017-07-115-92/+40
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix welcome page action items alignmentKushal Pandya2017-07-115-92/+40
|/ / / / / / / /
* | | | | | | | Merge branch 'revert-d7bbafd8' into 'master'Sean McGivern2017-07-113-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'"Rémy Coutable2017-07-113-6/+6
* | | | | | | | | Merge branch 'sh-disabled-prepared-statements-in-test' into 'master'Yorick Peterse2017-07-112-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Disabled prepared statements in testsh-disabled-prepared-statements-in-testStan Hu2017-07-102-0/+2
| | |_|/ / / / / | |/| | | | | |