summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'change-dashed-border-button-color' into 'master'Annabel Dunstone Gray2017-09-143-1/+8
|\
| * changed dashed border button color to be darkerchange-dashed-border-button-colorDimitrie Hoekstra2017-09-143-1/+8
* | Merge branch 'uipolish-fix-remember-me-checkbox' into 'master'Annabel Dunstone Gray2017-09-143-3/+12
|\ \
| * | Add missing classes to omniauth remember-me checkbox and add correct font-sizeJedidiah2017-09-143-3/+12
|/ /
* | Merge branch 'bvl-extend-query-recorder' into 'master'Rémy Coutable2017-09-143-7/+39
|\ \
| * | Use the new query-recorder features as a PoCbvl-extend-query-recorderBob Van Landuyt2017-09-142-5/+5
| * | Extend the QueryRecorder matcherBob Van Landuyt2017-09-141-2/+34
| |/
* | Merge branch 'gitlab-git-user' into 'master'Rémy Coutable2017-09-147-39/+45
|\ \
| * | Rename Gitlab::Git::Committer to UserJacob Vosmaer2017-09-147-39/+45
* | | Merge branch 'refactor-animate-js' into 'master'Clement Ho2017-09-144-57/+5
|\ \ \
| * | | Remove animate.js and the issuable label pulse animation.refactor-animate-jsBryce Johnson2017-09-134-57/+5
* | | | Merge branch '37739-improve-nginx-ingress-configuration-docs' into 'master'Achilleas Pipinellis2017-09-141-4/+4
|\ \ \ \
| * | | | Minor improvements37739-improve-nginx-ingress-configuration-docsJoshua Lambert2017-09-111-4/+4
* | | | | Merge branch 'docs/environment-url' into 'master'Rémy Coutable2017-09-141-0/+3
|\ \ \ \ \
| * | | | | Use a secret variable to define the repo suffixdocs/environment-urlAchilleas Pipinellis2017-09-141-2/+3
| * | | | | Expose URL under environments when triggering a docs review appAchilleas Pipinellis2017-09-121-0/+2
* | | | | | Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master'Grzegorz Bizon2017-09-142-5/+4
|\ \ \ \ \ \
| * | | | | | Don't force the encoding of the OAuth provider in Gitlab::OAuth::AuthHash#pro...37845-fix-oauth-provider-forced-encodingRémy Coutable2017-09-142-5/+4
* | | | | | | Merge branch '37759-also-treat-newlines-as-separator' into 'master'Kamil Trzciński2017-09-143-14/+30
|\ \ \ \ \ \ \
| * | | | | | | Add changelog entry37759-also-treat-newlines-as-separatorLin Jen-Shin2017-09-131-0/+5
| * | | | | | | Also treat newlines as separator, as people would do thatLin Jen-Shin2017-09-132-14/+25
* | | | | | | | Merge branch 'repo-cache-fix' into 'master'Kamil Trzciński2017-09-142-2/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Restore has_visible_content? to improve performance (cache)repo-cache-fixJarka Kadlecova2017-09-142-2/+8
|/ / / / / / /
* | | | | | | Merge branch '35978-milestone-title' into 'master'Phil Hughes2017-09-144-3/+15
|\ \ \ \ \ \ \
| * | | | | | | Truncate milestone text on collapse; add tooltip for titleAnnabel Dunstone Gray2017-09-144-3/+15
|/ / / / / / /
* | | | | | | Merge branch '37573-fix-sidebar-active-color' into 'master'Phil Hughes2017-09-142-16/+18
|\ \ \ \ \ \ \
| * | | | | | | Update badge color to match theme; lighten active color in sidebarAnnabel Dunstone Gray2017-09-142-16/+18
|/ / / / / / /
* | | | | | | Merge branch '34510-board-issues-sql-speedup' into 'master'Douwe Maan2017-09-144-5/+31
|\ \ \ \ \ \ \
| * | | | | | | fix another N+1 query for label priorities34510-board-issues-sql-speedupmicael.bergeron2017-09-123-3/+19
| * | | | | | | add changelog entrymicael.bergeron2017-09-121-0/+5
| * | | | | | | add association preloading for issue boardsmicael.bergeron2017-09-121-4/+9
* | | | | | | | Merge branch '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-th...Douwe Maan2017-09-144-3/+22
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | changed InlineDiffMarker to make it html_safe its output37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-headermicael.bergeron2017-09-123-4/+5
| * | | | | | | rework the html_safe not to use haml's auto escapingmicael.bergeron2017-09-113-3/+21
| * | | | | | | make diff file header html safe when file is renamedmicael.bergeron2017-09-111-2/+2
* | | | | | | | Merge branch 'sub-group-dropdown-width' into 'master'Annabel Dunstone Gray2017-09-141-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed width of sub-group in breadcrumb dropdownsub-group-dropdown-widthPhil Hughes2017-09-131-3/+3
* | | | | | | | | Merge branch 'fix_default_navigation_theme_selection' into 'master'Robert Speicher2017-09-131-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix the default navigation theme selection on invalid idVitaliy @blackst0ne Klachkov2017-09-141-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'repo-editor-ui-fix' into 'master'Jacob Schatz2017-09-132-2/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | RepoEditor: Fix markdown preview rendering.Fatih Acet2017-09-131-2/+2
| * | | | | | | | RepoEditor: Fix active line hilite color.Fatih Acet2017-09-131-0/+5
| * | | | | | | | RepoEditor: Fix empty state for image blob view.Fatih Acet2017-09-132-1/+8
|/ / / / / / / /
* | | | | | | | Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master'Rémy Coutable2017-09-132-4/+30
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Backport more EE changes to Gitlab::UrlSanitizerNick Thomas2017-09-112-4/+30
* | | | | | | | Merge branch 'revert-373ff978' into 'master'Stan Hu2017-09-131-0/+57
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Merge branch 'rs-remove-bad-foreground-migration' into 'master'"Robert Speicher2017-09-131-0/+57
* | | | | | | | | Merge branch 'docs-gitaly-client-config' into 'master'Achilleas Pipinellis2017-09-131-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix Ruby syntax error in Gitaly config exampledocs-gitaly-client-configJacob Vosmaer2017-09-121-2/+2
* | | | | | | | | | Merge branch 'ce-backport-new-sidebar-boards' into 'master'Filipa Lacerda2017-09-133-8/+24
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |