summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/MutableConstantDouwe Maan2017-02-2322-35/+35
* Enable Style/DotPositionDouwe Maan2017-02-2312-45/+45
* Merge branch 'improve-ee_compat_check-by-using-git-apply-3way-flag' into 'mas...Robert Speicher2017-02-221-1/+1
|\
| * Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag improve-ee_compat_check-by-using-git-apply-3way-flagRémy Coutable2017-02-221-1/+1
* | Merge branch 'connection-pool-host' into 'master'Rémy Coutable2017-02-221-1/+6
|\ \ | |/ |/|
| * Allow setting of a custom connection pool hostYorick Peterse2017-02-221-1/+6
* | Merge branch 'zj-fix-slash-command-labels' into 'master' Douwe Maan2017-02-221-1/+1
|\ \ | |/ |/|
| * Chat slash commands show labels correctlyzj-fix-slash-command-labelsZ.J. van de Weg2017-02-211-1/+1
* | Merge branch '26087-asciidoc-cicd-badges-snippet' into 'master'Rémy Coutable2017-02-221-0/+4
|\ \
| * | Add AsciiDoc snippet for CI/CD BadgesJan Christophersen2017-02-201-0/+4
* | | No more and/orDouwe Maan2017-02-211-1/+1
* | | Hash concurrent foreign key names similar to Railshash-concurrent-foreign-key-namesYorick Peterse2017-02-211-1/+10
| |/ |/|
* | Reuse User#find_by_any_email on UserFormatter#find_by_emailDouglas Barbosa Alexandre2017-02-201-10/+2
* | Use leading periods on UserFormatter#find_by_external_uidDouglas Barbosa Alexandre2017-02-201-2/+3
* | Add a simple cache for Gitlab::GithubImport::Client#userDouglas Barbosa Alexandre2017-02-201-0/+8
* | GitHub Importer - Find users based on their email addressDouglas Barbosa Alexandre2017-02-205-36/+89
* | Merge branch 'add-additional-checks-to-ca-data' into 'master' Jacob Schatz2017-02-187-0/+28
|\ \
| * | Restore exposure of legend property for eventsAlfredo Sumaran2017-02-107-0/+28
| |/
* | Merge branch 'add-yarn-documentation' into 'master' Clement Ho2017-02-171-3/+5
|\ \
| * \ Merge branch 'master' into add-yarn-documentationMike Greiling2017-02-164-34/+7
| |\ \
| * | | use NODE_ENV=production when compiling assets in upgrader scriptMike Greiling2017-02-161-1/+4
| * | | add yarn:install to upgrader scriptMike Greiling2017-02-161-1/+1
* | | | Merge branch '26500-informative-slack-notifications' into 'master' Kamil Trzciński2017-02-171-0/+10
|\ \ \ \
| * | | | Adding links to user & build in Chat NotificationsPoornima M2017-01-251-0/+10
* | | | | Merge branch '28329-allow-slash-in-slash-command-args' into 'master'Sean McGivern2017-02-171-1/+1
|\ \ \ \ \
| * | | | | Allow slashes in slash command argumentsRémy Coutable2017-02-171-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-171-87/+0
|\ \ \ \ \
| * | | | | Remove all gitlab theme related codeAnnabel Dunstone Gray2017-02-151-87/+0
| | |_|/ / | |/| | |
* | | | | Merge branch 'zj-fix-url-new-issue-presenter' into 'master' Kamil Trzciński2017-02-171-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix project link on issue creationzj-fix-url-new-issue-presenterZ.J. van de Weg2017-02-141-2/+2
* | | | | Merge branch 'fix-8.17-upgrade-process' into 'master' Alfredo Sumaran2017-02-161-0/+1
|\ \ \ \ \
| * | | | | move "Install node modules" step before "Migrate DB" within update processMike Greiling2017-02-161-1/+1
| * | | | | update migration docs for 8.17 to include minimum node versionMike Greiling2017-02-161-0/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'fix/import-hooks' into 'master' Rémy Coutable2017-02-163-32/+5
|\ \ \ \ \
| * | | | | Use gitlab shell import instead of manually creating the webhooksJames Lopez2017-02-163-32/+5
* | | | | | Merge branch 'snippets-search-performance' into 'master' Yorick Peterse2017-02-161-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Reduce query count for snippet searchsnippets-search-performancePhil Hughes2017-02-161-2/+2
* | | | | | Merge branch 'fix-github-import-MR-wrong-project' into 'security' Robert Speicher2017-02-151-3/+7
* | | | | | Merge branch 'fix-rdoc-xss' into 'security' Robert Speicher2017-02-151-0/+3
* | | | | | Merge branch 'asciidoctor-xss-patch' into 'security' Robert Speicher2017-02-151-0/+3
|/ / / / /
* | | | | Merge branch 'dz-nested-groups-improvements-3' into 'master' Dmitriy Zaporozhets2017-02-154-4/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'dz-nested-groups-improvements-3'Dmitriy Zaporozhets2017-02-142-3/+30
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Use Namespace#full_path instead of Namespace#pathDmitriy Zaporozhets2017-02-144-4/+4
| | |/ / / | |/| | |
* | | | | SidekiqStatus need to be qualified in some cases27759-fix-sidekiq_status-client_middleware-issueRémy Coutable2017-02-142-2/+2
| |/ / / |/| | |
* | | | Merge branch 'create-connection-pool' into 'master' Yorick Peterse2017-02-141-0/+25
|\ \ \ \
| * | | | Only ensure against yield so that pool should be availablecreate-connection-poolLin Jen-Shin2017-02-141-4/+5
| * | | | Have some simple way to create connection poolLin Jen-Shin2017-02-141-0/+24
* | | | | Merge branch 'fix-ar-connection-leaks' into 'master'Rémy Coutable2017-02-141-1/+1
|\ \ \ \ \
| * | | | | Don't connect in Gitlab::Database.adapter_namefix-ar-connection-leaksYorick Peterse2017-02-131-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch '22645-add-discussion-contribs-to-calendar' into 'master' Sean McGivern2017-02-141-2/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
View Lorry Controller Status