summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix linter error36185-or-separatorFilipa Lacerda2017-08-101-1/+1
|
* Aligns OR separater to center properlyFilipa Lacerda2017-08-102-5/+9
|
* Merge branch 'gitaly-repository-exists' into 'master'32665-make-project-and-features-visibility-settings-less-confusingSean McGivern2017-08-092-20/+1
|\ | | | | | | | | Rename RPC 'Exists' to 'RepositoryExists' See merge request !13277
| * Rename RPC 'Exists' to 'RepositoryExists'Jacob Vosmaer2017-08-092-20/+1
| |
* | Merge branch 'fix-gitlab-pages-cache-config' into 'master'Grzegorz Bizon2017-08-092-2/+8
|\ \ | | | | | | | | | | | | Fix proxy config in Gitlab Pages nginx examples See merge request !13375
| * | Fix proxy config in Gitlab Pages nginx examplesNick Thomas2017-08-082-2/+8
| | |
* | | Merge branch '36003-do-not-include-to-kernel' into 'master'Robert Speicher2017-08-097-33/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't include anything to Kernel only because of tasks Closes #36003 See merge request !13380
| * | | Properly set the expectation on the main object36003-do-not-include-to-kernelLin Jen-Shin2017-08-093-19/+23
| | | |
| * | | We shouldn't include utility methods everywhereLin Jen-Shin2017-08-082-1/+4
| | | |
| * | | Just extend main, rather than include to KernelLin Jen-Shin2017-08-082-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately rake doesn't have nested context, everything just runs on a main rake object. This is probably due to compatibility issue, but anyway, we could just extend the object.
* | | | Merge branch 'mk-validate-username-change-with-container-registry-tags' into ↵Robert Speicher2017-08-094-1/+24
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Prevent user from changing username with container registry tags Closes #35451 See merge request !13356
| * | | Prevent user from changing username with container registry tagsMichael Kozono2017-08-094-1/+24
|/ / /
* | | Merge branch 'rc/enable-the-Layout/SpaceBeforeBlockBraces-cop' into 'master'Robert Speicher2017-08-0982-168/+169
|\ \ \ | | | | | | | | | | | | | | | | Enable the Layout/SpaceBeforeBlockBraces cop See merge request !13413
| * | | Fix ee_compat_check when EE branch uses a prefixRémy Coutable2017-08-091-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-0981-166/+166
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '35996-icon-hover-color' into 'master'Phil Hughes2017-08-091-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update icon color on hover Closes #35996 See merge request !13393
| * | | | Update icon color on hover35996-icon-hover-colorAnnabel Dunstone Gray2017-08-081-0/+4
| | | | |
* | | | | Merge branch 'mr-changes-container-full-width' into 'master'Annabel Dunstone Gray2017-08-092-15/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed merge request changes sticky container not spreading full width See merge request !13386
| * | | | | Fixed merge request changes sticky container not spreading full widthmr-changes-container-full-widthPhil Hughes2017-08-082-15/+16
| | | | | |
* | | | | | Merge branch '36179-align-nav-items' into 'master'Phil Hughes2017-08-091-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align all nav items in sidebar Closes #36179 See merge request !13392
| * | | | | | Align all nav items in sidebar36179-align-nav-itemsAnnabel Dunstone Gray2017-08-081-1/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix-collapsed-sidebar-item-height' into 'master'Phil Hughes2017-08-091-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix height of collapsed sidebar items See merge request !13385
| * | | | | | Fix height of collapsed sidebar itemsfix-collapsed-sidebar-item-heightAnnabel Dunstone Gray2017-08-081-2/+5
| |/ / / / /
* | | | | | Merge branch 'dz-clarify-constrainer-query' into 'master'Sean McGivern2017-08-091-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain why we use select all for project_url_constrainer.rb See merge request !13425
| * | | | | | Explain why we use select all for project_url_constrainer.rbDmitriy Zaporozhets2017-08-091-0/+2
| | | | | | |
* | | | | | | Merge branch 'pikaday-undefined-fix' into 'master'Tim Zallmann2017-08-094-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Pikaday being undefined Closes #36207 See merge request !13422
| * | | | | | Fix pikaday being undefinedPhil Hughes2017-08-094-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #36207
* | | | | | | Merge branch '36119-issuable-workers' into 'master'Sean McGivern2017-08-096-13/+22
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify checking if objects exist code in new issaubles workers Closes #36119 See merge request !13365
| * | | | | | Simplify checking if objects exist code in new issaubles workers36119-issuable-workersJarka Kadlecova2017-08-086-13/+22
| | | | | | |
* | | | | | | Merge branch 'bvl-port-storage-spec-helpers-from-ee' into 'master'Sean McGivern2017-08-091-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a helper to stub storage settings with defaults See merge request !13419
| * | | | | | | Add a helper to stub storage settings with defaultsbvl-port-storage-spec-helpers-from-eeBob Van Landuyt2017-08-091-0/+11
| | | | | | | |
* | | | | | | | Merge branch 'update-installation-docs-9-5' into 'master'Achilleas Pipinellis2017-08-091-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update Install from Source instructions See merge request !13411
| * | | | | | | | update Install from Source instructionsSimon Knox2017-08-091-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'ask-for-exceptions-in-advance' into 'master'Rémy Coutable2017-08-091-10/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ask for exceptions in advance See merge request !13409
| * | | | | | | | Translations can be picked without asking for exceptionsSean McGivern2017-08-091-5/+12
| | | | | | | | |
| * | | | | | | | Ask for exceptions in advanceSean McGivern2017-08-091-5/+15
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a feature is really really really really important (most aren't), but we aren't confident that it is ready on the 7th, people can ask for an exception to the freeze process in advance, and it will be picked once it's merged.
* | | | | | | | Merge branch 'rc/cob-do-not-require-stackprof' into 'master'Sean McGivern2017-08-092-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't require stackprof in Gemfile See merge request !13407
| * | | | | | | | Don't require stackprof in GemfileRémy Coutable2017-08-092-2/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'update-source-install-docs-with-i18n' into 'master'Rémy Coutable2017-08-095-9/+37
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs with i18n info for source installations Closes #35193 See merge request !13212
| * | | | | | | Update docs with i18n info for source installationsupdate-source-install-docs-with-i18nRubén Dávila2017-08-085-9/+37
| | | | | | | |
* | | | | | | | Merge branch ↵Rémy Coutable2017-08-092-1/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absolute' into 'master' Resolve "user_avatar URL in push event webhook JSON payload is relative, should be absolute" Closes #34339 See merge request !13401
| * | | | | | | Use full path of user's avatar in webhooks34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absoluteblackst0ne2017-08-092-1/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'synchronous_korean_translation_in_zanata' into 'master'Rémy Coutable2017-08-091-8/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synchronous Korean translation in zanata See merge request !13402
| * | | | | | | Synchronous Korean translation in zanata黄涛2017-08-091-8/+11
| |/ / / / / /
* | | | | | | Merge branch 'patch-24' into 'master'Achilleas Pipinellis2017-08-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there are 3 dots but it says four products. fixed See merge request !13129
| * | | | | | | Update README.md with a more flexible sentencePaolo Falomo2017-08-071-1/+1
| | | | | | | |
| * | | | | | | there are 3 dots but it says four products. fixed Paolo Falomo2017-07-271-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'docs-invalid-json-examples-for-system-hooks' into 'master'Achilleas Pipinellis2017-08-091-7/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove trailing comma in System Hooks payload examples Closes #36071 See merge request !13367
| * | | | | | | | Remove trailing comma in System Hooks payload examplesMark Fletcher2017-08-081-7/+7
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-structured-log-docs' into 'master'Achilleas Pipinellis2017-08-091-0/+27
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Add docs on structured logging in GitLab See merge request !13396