summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'replace_spinach_spec_browse_files' into 'master'Rémy Coutable2017-07-1213-380/+821
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Replace 'browse_files.feature' spinach test with an rspec analogblackst0ne2017-07-1213-380/+821
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '34325-reinstate-is_admin-for-user-api' into 'master'Sean McGivern2017-07-125-6/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Return `is_admin` attribute in the GET /user endpoint for adminsRémy Coutable2017-07-125-6/+53
* | | | | | | | | | | Merge branch '34978-remove-public-ci-favicon-ico' into 'master'Rémy Coutable2017-07-122-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove public/ci/favicon.icoTakuya Noguchi2017-07-122-0/+4
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '34858-bump-scss-lint-to-0-54-0' into 'master'Rémy Coutable2017-07-124-5/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Bump scss-lint to 0.54.0Takuya Noguchi2017-07-084-5/+13
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'update-gitaly-0-17-0' into 'master'Rémy Coutable2017-07-121-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use Gitaly server v0.17.0update-gitaly-0-17-0Alejandro Rodríguez2017-07-111-1/+1
* | | | | | | | | | | Merge branch 'new-nav-preferences-image' into 'master'Filipa Lacerda2017-07-121-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Updated new navigation image in preferencesPhil Hughes2017-07-121-0/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'remove-nprogress-gleaning' into 'master'Clement Ho2017-07-122-6/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove CSS for nprogress removedTakuya Noguchi2017-07-122-6/+4
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'enable-scss-lint-import-path' into 'master'Clement Ho2017-07-124-46/+50
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enable ImportPath in scss-lintTakuya Noguchi2017-07-124-46/+50
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'enable-scss-lint-property-spelling' into 'master'Clement Ho2017-07-122-1/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Enable PropertySpelling in scss-lintTakuya Noguchi2017-07-122-1/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'enable-scss-lint-space-after-comma' into 'master'Clement Ho2017-07-127-18/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enable SpaceAfterComma in scss-lintTakuya Noguchi2017-07-127-18/+22
| |/ / / / / / / /
* | | | | | | | | Merge branch 'breadcrumbs-limit-width' into 'master'Annabel Dunstone Gray2017-07-114-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added limit-container-width to breadcrumbs containerbreadcrumbs-limit-widthPhil Hughes2017-07-114-1/+4
* | | | | | | | | | Merge branch 'rs-issue-34941' into 'master'Stan Hu2017-07-112-17/+33
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Make `Redis::Wrapper#_raw_config` and `#fetch_config` more resilientRobert Speicher2017-07-112-17/+33
* | | | | | | | | | 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