summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Null out version values we cannot know if it matches the actual helm chart ve...49580-nullify-bad-clusters-applications-version-valuesThong Kuah2018-07-2611-5/+182
* Merge branch 'jivl-redesign-contributors-graph' into 'master'Clement Ho2018-07-257-19/+717
|\
| * Add bar chart componentjivl-redesign-contributors-graphJose2018-07-257-19/+717
* | Merge branch '32783-api-all-members-with-ancestors' into 'master'Robert Speicher2018-07-255-36/+200
|\ \
| * | Resolve "API endpoint that returns all members, including the inherited membe...🙈 jacopo beschi 🙉2018-07-255-36/+200
|/ /
* | Merge branch '49192-comment-alignment' into 'master'Clement Ho2018-07-251-0/+1
|\ \
| * | Fix alignment of code comment button49192-comment-alignmentAnnabel Dunstone Gray2018-07-201-0/+1
* | | Merge branch 'ch-gitlab-ui-progress-bar' into 'master'Tim Zallmann2018-07-259-56/+139
|\ \ \
| * | | Replace issues time tracking progress bar with gitlab-ui's progress barClement Ho2018-07-259-56/+139
|/ / /
* | | Move custom_wiki_sidebar changelog entry to the correct locationRobert Speicher2018-07-251-0/+0
* | | Merge branch '49364-fix-broadcast-margin' into 'master'Annabel Gray2018-07-252-1/+6
|\ \ \
| * | | Fix broadcast message misalignment on login pageRobin Naundorf2018-07-242-1/+6
* | | | Merge branch 'ce-6064-geo-sql-query-for-counting-projects-with-wikis-is-very-...Douglas Barbosa Alexandre2018-07-2512-1/+307
|\ \ \ \
| * | | | Document site statistics APIce-6064-geo-sql-query-for-counting-projects-with-wikis-is-very-slowGabriel Mazetto2018-07-241-0/+21
| * | | | Apply pattern to make `find_or_create` atomicGabriel Mazetto2018-07-241-7/+10
| * | | | Use activerecord migration version instead of rescuing for missing tablesGabriel Mazetto2018-07-241-10/+14
| * | | | Added SiteStatistics as counter cache for Projects and WikisGabriel Mazetto2018-07-2411-1/+274
| * | | | CHANGELOGGabriel Mazetto2018-07-241-0/+5
* | | | | Merge branch 'issue47716-email_confirmations-squash' into 'master'Douwe Maan2018-07-253-0/+24
|\ \ \ \ \
| * | | | | fixes #47716 where email confirmation fails after adding additional emailsMuhammad Nuzaihan2018-07-253-0/+24
|/ / / / /
* | | | | Merge branch 'sh-include-rbtrace' into 'master'Douwe Maan2018-07-256-0/+34
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add rbtrace to Gemfilesh-include-rbtraceStan Hu2018-07-256-0/+34
* | | | | Merge branch '49582-enable-cops-for-db' into 'master'Rémy Coutable2018-07-25167-157/+55
|\ \ \ \ \
| * | | | | Enable rubocop for db/**/* and ee/db/**/*49582-enable-cops-for-dbLin Jen-Shin2018-07-25167-157/+55
| | |/ / / | |/| | |
* | | | | Merge branch 'backport-reactive-caching' into 'master'Rémy Coutable2018-07-252-2/+15
|\ \ \ \ \
| * | | | | Backport reactive cachingShinya Maeda2018-07-252-2/+15
| | |/ / / | |/| | |
* | | | | Merge branch '49025-docs-kubernetes-tiller' into 'master'Marcia Ramos2018-07-252-7/+16
|\ \ \ \ \
| * | | | | Update docs of Helm TillerTakuya Noguchi2018-07-132-7/+16
* | | | | | Merge branch 'docs/styleguide-versions' into 'master'Marcia Ramos2018-07-251-8/+6
|\ \ \ \ \ \
| * | | | | | Prefer using direct links in docs styleguidedocs/styleguide-versionsAchilleas Pipinellis2018-07-251-8/+6
* | | | | | | Merge branch 'update-rack-attack-deprecation-note-in-docs' into 'master'Douwe Maan2018-07-251-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Adds rack attack disabled by default notice to documentationupdate-rack-attack-deprecation-note-in-docsTiago Botelho2018-07-251-0/+4
* | | | | | | | Merge branch '40973-disable-rack-attack-by-default' into 'master'Douwe Maan2018-07-254-4/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds changelogTiago Botelho2018-07-251-0/+5
| * | | | | | | | Fix Rack Attack documentation to reflect the feature being disabled by defaultTiago Botelho2018-07-251-3/+3
| * | | | | | | | Disables Rack Attack by defaultTiago Botelho2018-07-252-1/+9
| |/ / / / / / /
* | | | | | | | Merge branch 'frozen-string-enable-app-presenters' into 'master'Rémy Coutable2018-07-2549-0/+101
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable frozen string in presenters and policiesrepo-forks/gitlab-ce-frozen-string-enable-app-presentersgfyoung2018-07-2449-0/+101
* | | | | | | | | Merge branch 'i18n-extract-app/views/layouts' into 'master'Rémy Coutable2018-07-2529-232/+371
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | i18n: externalize strings from 'app/views/layouts'Tao Wang2018-07-2329-232/+371
* | | | | | | | | Merge branch 'sh-bump-html-pipeline-2.8.4' into 'master'Rémy Coutable2018-07-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump html-pipeline to 2.8.4sh-bump-html-pipeline-2.8.4Stan Hu2018-07-241-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'replace-all-snake-case-in-scss-variables' into 'master'Phil Hughes2018-07-2523-164/+163
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace snake case in mixins and merge_conflicts variablesGeorge Tsiolis2018-07-253-110/+109
| * | | | | | | | | Replace snake case in SCSS variablesGeorge Tsiolis2018-07-2520-54/+54
* | | | | | | | | | Merge branch 'sh-use-wiki-limit-parameter-gitaly' into 'master'Sean McGivern2018-07-2511-14/+105
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use limit parameter to retrieve Wikis from Gitalysh-use-wiki-limit-parameter-gitalyStan Hu2018-07-2411-14/+105
* | | | | | | | | | | Merge branch 'docs-fix-users-md-typo' into 'master'Achilleas Pipinellis2018-07-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix missing ` in users.mdfix-users-md-typodocs-fix-users-md-typoLin Jen-Shin2018-07-241-2/+2
* | | | | | | | | | | | Merge branch 'replace-snake-case-css-classes' into 'master'Phil Hughes2018-07-2519-33/+36
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
View Lorry Controller Status