Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into ↵36133-project-overview-page-doesn-t-load-commit-metadata-for-repo-view | Mike Greiling | 2017-08-10 | 218 | -778/+1763 |
|\ | | | | | | | | | | | '36133-project-overview-page-doesn-t-load-commit-metadata-for-repo-view' # Conflicts: # app/assets/javascripts/dispatcher.js | ||||
| * | Merge branch 'gitaly-repository-exists' into 'master'32665-make-project-and-features-visibility-settings-less-confusing | Sean McGivern | 2017-08-09 | 2 | -20/+1 |
| |\ | | | | | | | | | | | | | Rename RPC 'Exists' to 'RepositoryExists' See merge request !13277 | ||||
| | * | Rename RPC 'Exists' to 'RepositoryExists' | Jacob Vosmaer | 2017-08-09 | 2 | -20/+1 |
| | | | |||||
| * | | Merge branch 'fix-gitlab-pages-cache-config' into 'master' | Grzegorz Bizon | 2017-08-09 | 2 | -2/+8 |
| |\ \ | | | | | | | | | | | | | | | | | Fix proxy config in Gitlab Pages nginx examples See merge request !13375 | ||||
| | * | | Fix proxy config in Gitlab Pages nginx examples | Nick Thomas | 2017-08-08 | 2 | -2/+8 |
| | | | | |||||
| * | | | Merge branch '36003-do-not-include-to-kernel' into 'master' | Robert Speicher | 2017-08-09 | 7 | -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-kernel | Lin Jen-Shin | 2017-08-09 | 3 | -19/+23 |
| | | | | | |||||
| | * | | | We shouldn't include utility methods everywhere | Lin Jen-Shin | 2017-08-08 | 2 | -1/+4 |
| | | | | | |||||
| | * | | | Just extend main, rather than include to Kernel | Lin Jen-Shin | 2017-08-08 | 2 | -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 Speicher | 2017-08-09 | 4 | -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 tags | Michael Kozono | 2017-08-09 | 4 | -1/+24 |
| |/ / / | |||||
| * | | | Merge branch 'rc/enable-the-Layout/SpaceBeforeBlockBraces-cop' into 'master' | Robert Speicher | 2017-08-09 | 82 | -168/+169 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Enable the Layout/SpaceBeforeBlockBraces cop See merge request !13413 | ||||
| | * | | | Fix ee_compat_check when EE branch uses a prefix | Rémy Coutable | 2017-08-09 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-cop | Rémy Coutable | 2017-08-09 | 81 | -166/+166 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | Merge branch '35996-icon-hover-color' into 'master' | Phil Hughes | 2017-08-09 | 1 | -0/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update icon color on hover Closes #35996 See merge request !13393 | ||||
| | * | | | | Update icon color on hover35996-icon-hover-color | Annabel Dunstone Gray | 2017-08-08 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Merge branch 'mr-changes-container-full-width' into 'master' | Annabel Dunstone Gray | 2017-08-09 | 2 | -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-width | Phil Hughes | 2017-08-08 | 2 | -15/+16 |
| | | | | | | | |||||
| * | | | | | | Merge branch '36179-align-nav-items' into 'master' | Phil Hughes | 2017-08-09 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align all nav items in sidebar Closes #36179 See merge request !13392 | ||||
| | * | | | | | | Align all nav items in sidebar36179-align-nav-items | Annabel Dunstone Gray | 2017-08-08 | 1 | -1/+2 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'fix-collapsed-sidebar-item-height' into 'master' | Phil Hughes | 2017-08-09 | 1 | -2/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix height of collapsed sidebar items See merge request !13385 | ||||
| | * | | | | | | Fix height of collapsed sidebar itemsfix-collapsed-sidebar-item-height | Annabel Dunstone Gray | 2017-08-08 | 1 | -2/+5 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch 'dz-clarify-constrainer-query' into 'master' | Sean McGivern | 2017-08-09 | 1 | -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.rb | Dmitriy Zaporozhets | 2017-08-09 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'pikaday-undefined-fix' into 'master' | Tim Zallmann | 2017-08-09 | 4 | -5/+5 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Pikaday being undefined Closes #36207 See merge request !13422 | ||||
| | * | | | | | | Fix pikaday being undefined | Phil Hughes | 2017-08-09 | 4 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #36207 | ||||
| * | | | | | | | Merge branch '36119-issuable-workers' into 'master' | Sean McGivern | 2017-08-09 | 6 | -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-workers | Jarka Kadlecova | 2017-08-08 | 6 | -13/+22 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'bvl-port-storage-spec-helpers-from-ee' into 'master' | Sean McGivern | 2017-08-09 | 1 | -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-ee | Bob Van Landuyt | 2017-08-09 | 1 | -0/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'update-installation-docs-9-5' into 'master' | Achilleas Pipinellis | 2017-08-09 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update Install from Source instructions See merge request !13411 | ||||
| | * | | | | | | | | update Install from Source instructions | Simon Knox | 2017-08-09 | 1 | -2/+2 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'ask-for-exceptions-in-advance' into 'master' | Rémy Coutable | 2017-08-09 | 1 | -10/+27 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ask for exceptions in advance See merge request !13409 | ||||
| | * | | | | | | | | Translations can be picked without asking for exceptions | Sean McGivern | 2017-08-09 | 1 | -5/+12 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Ask for exceptions in advance | Sean McGivern | 2017-08-09 | 1 | -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 McGivern | 2017-08-09 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't require stackprof in Gemfile See merge request !13407 | ||||
| | * | | | | | | | | Don't require stackprof in Gemfile | Rémy Coutable | 2017-08-09 | 2 | -2/+3 |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | Merge branch 'update-source-install-docs-with-i18n' into 'master' | Rémy Coutable | 2017-08-09 | 5 | -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-i18n | Rubén Dávila | 2017-08-08 | 5 | -9/+37 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch ↵ | Rémy Coutable | 2017-08-09 | 2 | -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-absolute | blackst0ne | 2017-08-09 | 2 | -1/+5 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'synchronous_korean_translation_in_zanata' into 'master' | Rémy Coutable | 2017-08-09 | 1 | -8/+11 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synchronous Korean translation in zanata See merge request !13402 | ||||
| | * | | | | | | | Synchronous Korean translation in zanata | 黄涛 | 2017-08-09 | 1 | -8/+11 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'patch-24' into 'master' | Achilleas Pipinellis | 2017-08-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there are 3 dots but it says four products. fixed See merge request !13129 | ||||
| | * | | | | | | | Update README.md with a more flexible sentence | Paolo Falomo | 2017-08-07 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | there are 3 dots but it says four products. fixed | Paolo Falomo | 2017-07-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'docs-invalid-json-examples-for-system-hooks' into 'master' | Achilleas Pipinellis | 2017-08-09 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove trailing comma in System Hooks payload examples Closes #36071 See merge request !13367 | ||||
| | * | | | | | | | | Remove trailing comma in System Hooks payload examples | Mark Fletcher | 2017-08-08 | 1 | -7/+7 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'sh-structured-log-docs' into 'master' | Achilleas Pipinellis | 2017-08-09 | 1 | -0/+27 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add docs on structured logging in GitLab See merge request !13396 | ||||
| | * | | | | | | | Add docs on structured logging in GitLabsh-structured-log-docs | Stan Hu | 2017-08-08 | 1 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] |