Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cache Appearance instances in Redisappearances-caching-and-schema | Yorick Peterse | 2017-08-10 | 7 | -6/+98 |
| | | | | | | | | This caches the result of Appearance.first in a similar fashion to how ApplicationSetting instances are cached. We also add some NOT NULL constraints to the table and correct the timestamp types. Fixes gitlab-org/gitlab-ce#36066, fixes gitlab-org/gitlab-ce#31698 | ||||
* | Merge branch '36185-or-separator' into 'master' | Phil Hughes | 2017-08-10 | 2 | -5/+9 |
|\ | | | | | | | | | | | | | Aligns OR separater to center properly Closes #36185 See merge request !13446 | ||||
| * | Fix linter error36185-or-separator | Filipa Lacerda | 2017-08-10 | 1 | -1/+1 |
| | | |||||
| * | Aligns OR separater to center properly | Filipa Lacerda | 2017-08-10 | 2 | -5/+9 |
| | | |||||
* | | Merge branch '35342-re2-in-upgrade-docs' into 'master' | Rémy Coutable | 2017-08-10 | 6 | -0/+53 |
|\ \ | | | | | | | | | | | | | Include RE2 in the upgrade docs See merge request !13448 | ||||
| * | | Include RE2 in the upgrade docs | Nick Thomas | 2017-08-10 | 6 | -0/+53 |
| | | | |||||
* | | | Merge branch 'remove-unused-redirect_to_external_issue_tracker' into 'master' | Rémy Coutable | 2017-08-10 | 1 | -12/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | Remove unused `redirect_to_external_issue_tracker` method See merge request !13444 | ||||
| * | | | Remove unused `redirect_to_external_issue_tracker` method | Mehdi Lahmam | 2017-08-10 | 1 | -12/+0 |
| | |/ | |/| | | | | | | | Its usage has been removed at 2fa22a0729. | ||||
* | | | Merge branch 'jarv/update-gemfile-lock' into 'master' | Rémy Coutable | 2017-08-10 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | Updating Gemfile.lock for rubocop-rspec dependecy. See merge request !13410 | ||||
| * | | Updating Gemfile.lock for rubocop-rspec dependecy.jarv/update-gemfile-lock | John Jarvis | 2017-08-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GDK pipeline is failing with this error: ``` Downloading rubocop-rspec-1.15.1 revealed dependencies not in the API or the lockfile (rubocop (>= 0.42.0)). Either installing with `--full-index` or running `bundle update rubocop-rspec` should fix the problem. ``` Updated lockfile by running the bundle update. `gdk install` works now. | ||||
* | | | Merge branch 'gitlab-infrastructure-archive-route-quick-fix' into 'master' | Rémy Coutable | 2017-08-10 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | alternative route for download archive See merge request !13439 | ||||
| * | | | alternative route for download archive | haseeb | 2017-08-10 | 1 | -0/+3 |
|/ / / | |||||
* | | | Merge branch 'fixed-sticky-stats-box-commit-view' into 'master' | Filipa Lacerda | 2017-08-10 | 6 | -14/+23 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix the sticky changes bar on commits page See merge request !13343 | ||||
| * | | | Fix the sticky changes bar on commits pagefixed-sticky-stats-box-commit-view | Phil Hughes | 2017-08-09 | 6 | -14/+23 |
| | | | | |||||
* | | | | Merge branch 'fly-out-fix-hiding' into 'master' | Filipa Lacerda | 2017-08-10 | 2 | -2/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed display styles when hiding the fly out navigation Closes #36224 See merge request !13431 | ||||
| * | | | | Removed display styles when hiding the fly out navigationfly-out-fix-hiding | Phil Hughes | 2017-08-09 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | Closes #36224 | ||||
* | | | | | Merge branch 'fix-update-guide-with-missing-i18n-section' into 'master' | Rémy Coutable | 2017-08-10 | 1 | -0/+4 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Add missing command to compile GetText files See merge request !13437 | ||||
| * | | | | Add missing command to compile GetText filesfix-update-guide-with-missing-i18n-section | Rubén Dávila | 2017-08-09 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | 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 |