Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch 'ci-environment-status-performance' into 'master' | Stan Hu | 2017-09-14 | 5 | -3/+32 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Disallow NULL values for environments.project_idci-environment-status-performance | Yorick Peterse | 2017-09-13 | 3 | -2/+23 | |
| * | | | | | | | Constrain environment deployments to project IDs | Yorick Peterse | 2017-09-13 | 2 | -1/+9 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'change-dashed-border-button-color' into 'master' | Annabel Dunstone Gray | 2017-09-14 | 3 | -1/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | changed dashed border button color to be darkerchange-dashed-border-button-color | Dimitrie Hoekstra | 2017-09-14 | 3 | -1/+8 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'uipolish-fix-remember-me-checkbox' into 'master' | Annabel Dunstone Gray | 2017-09-14 | 3 | -3/+12 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add missing classes to omniauth remember-me checkbox and add correct font-size | Jedidiah | 2017-09-14 | 3 | -3/+12 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'bvl-extend-query-recorder' into 'master' | Rémy Coutable | 2017-09-14 | 3 | -7/+39 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use the new query-recorder features as a PoCbvl-extend-query-recorder | Bob Van Landuyt | 2017-09-14 | 2 | -5/+5 | |
| * | | | | | | | Extend the QueryRecorder matcher | Bob Van Landuyt | 2017-09-14 | 1 | -2/+34 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'gitlab-git-user' into 'master' | Rémy Coutable | 2017-09-14 | 7 | -39/+45 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Rename Gitlab::Git::Committer to User | Jacob Vosmaer | 2017-09-14 | 7 | -39/+45 | |
* | | | | | | | | Merge branch 'refactor-animate-js' into 'master' | Clement Ho | 2017-09-14 | 4 | -57/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove animate.js and the issuable label pulse animation.refactor-animate-js | Bryce Johnson | 2017-09-13 | 4 | -57/+5 | |
* | | | | | | | | | Merge branch '37739-improve-nginx-ingress-configuration-docs' into 'master' | Achilleas Pipinellis | 2017-09-14 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | ||||||
| * | | | | | | | | Minor improvements37739-improve-nginx-ingress-configuration-docs | Joshua Lambert | 2017-09-11 | 1 | -4/+4 | |
* | | | | | | | | | Merge branch 'docs/environment-url' into 'master' | Rémy Coutable | 2017-09-14 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Use a secret variable to define the repo suffixdocs/environment-url | Achilleas Pipinellis | 2017-09-14 | 1 | -2/+3 | |
| * | | | | | | | | | Expose URL under environments when triggering a docs review app | Achilleas Pipinellis | 2017-09-12 | 1 | -0/+2 | |
* | | | | | | | | | | Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master' | Grzegorz Bizon | 2017-09-14 | 2 | -5/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Don't force the encoding of the OAuth provider in Gitlab::OAuth::AuthHash#pro...37845-fix-oauth-provider-forced-encoding | Rémy Coutable | 2017-09-14 | 2 | -5/+4 | |
* | | | | | | | | | | | Merge branch '37759-also-treat-newlines-as-separator' into 'master' | Kamil Trzciński | 2017-09-14 | 3 | -14/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add changelog entry37759-also-treat-newlines-as-separator | Lin Jen-Shin | 2017-09-13 | 1 | -0/+5 | |
| * | | | | | | | | | | | Also treat newlines as separator, as people would do that | Lin Jen-Shin | 2017-09-13 | 2 | -14/+25 | |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'repo-cache-fix' into 'master' | Kamil Trzciński | 2017-09-14 | 2 | -2/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Restore has_visible_content? to improve performance (cache)repo-cache-fix | Jarka Kadlecova | 2017-09-14 | 2 | -2/+8 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch '35978-milestone-title' into 'master' | Phil Hughes | 2017-09-14 | 4 | -3/+15 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Truncate milestone text on collapse; add tooltip for title | Annabel Dunstone Gray | 2017-09-14 | 4 | -3/+15 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch '37573-fix-sidebar-active-color' into 'master' | Phil Hughes | 2017-09-14 | 2 | -16/+18 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Update badge color to match theme; lighten active color in sidebar | Annabel Dunstone Gray | 2017-09-14 | 2 | -16/+18 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch '34510-board-issues-sql-speedup' into 'master' | Douwe Maan | 2017-09-14 | 4 | -5/+31 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fix another N+1 query for label priorities34510-board-issues-sql-speedup | micael.bergeron | 2017-09-12 | 3 | -3/+19 | |
| * | | | | | | | | | add changelog entry | micael.bergeron | 2017-09-12 | 1 | -0/+5 | |
| * | | | | | | | | | add association preloading for issue boards | micael.bergeron | 2017-09-12 | 1 | -4/+9 | |
* | | | | | | | | | | Merge branch '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-th... | Douwe Maan | 2017-09-14 | 4 | -3/+22 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | changed InlineDiffMarker to make it html_safe its output37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header | micael.bergeron | 2017-09-12 | 3 | -4/+5 | |
| * | | | | | | | | | rework the html_safe not to use haml's auto escaping | micael.bergeron | 2017-09-11 | 3 | -3/+21 | |
| * | | | | | | | | | make diff file header html safe when file is renamed | micael.bergeron | 2017-09-11 | 1 | -2/+2 | |
* | | | | | | | | | | Merge branch 'sub-group-dropdown-width' into 'master' | Annabel Dunstone Gray | 2017-09-14 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fixed width of sub-group in breadcrumb dropdownsub-group-dropdown-width | Phil Hughes | 2017-09-13 | 1 | -3/+3 | |
* | | | | | | | | | | | Merge branch 'fix_default_navigation_theme_selection' into 'master' | Robert Speicher | 2017-09-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix the default navigation theme selection on invalid id | Vitaliy @blackst0ne Klachkov | 2017-09-14 | 1 | -1/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'repo-editor-ui-fix' into 'master' | Jacob Schatz | 2017-09-13 | 2 | -2/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | RepoEditor: Fix markdown preview rendering. | Fatih Acet | 2017-09-13 | 1 | -2/+2 | |
| * | | | | | | | | | | RepoEditor: Fix active line hilite color. | Fatih Acet | 2017-09-13 | 1 | -0/+5 | |
| * | | | | | | | | | | RepoEditor: Fix empty state for image blob view. | Fatih Acet | 2017-09-13 | 2 | -1/+8 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master' | Rémy Coutable | 2017-09-13 | 2 | -4/+30 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Backport more EE changes to Gitlab::UrlSanitizer | Nick Thomas | 2017-09-11 | 2 | -4/+30 | |
* | | | | | | | | | | Merge branch 'revert-373ff978' into 'master' | Stan Hu | 2017-09-13 | 1 | -0/+57 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Revert "Merge branch 'rs-remove-bad-foreground-migration' into 'master'" | Robert Speicher | 2017-09-13 | 1 | -0/+57 |